From f32b67f1780f91a43dc0b7497eac70eae7044b5b Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Fri, 2 Feb 2024 15:56:31 +0400
Subject: [PATCH 01/95] Save WIP.

---
 js/src/data/action-types.js                   |  2 +
 js/src/data/actions.js                        |  7 ++
 js/src/data/reducer.js                        | 16 ++++
 js/src/data/resolvers.js                      | 28 ++++++-
 js/src/data/selectors.js                      | 10 +++
 .../wordpress/guide/index.js                  |  4 +
 js/src/hooks/useAcceptedCustomerDataTerms.js  | 23 ++++++
 js/src/hooks/useAllowEnhancedConversions.js   | 23 ++++++
 .../EnhancedConversion.js                     | 57 +++++++++++++
 .../EnhancedConversionFooter.js               | 40 +++++++++
 .../submission-success-guide/index.js         | 82 ++++++++++---------
 src/API/Google/Ads.php                        |  8 ++
 .../Controllers/Ads/AccountController.php     | 22 +++++
 src/Ads/AccountService.php                    | 13 +++
 14 files changed, 294 insertions(+), 41 deletions(-)
 create mode 100644 js/src/hooks/useAcceptedCustomerDataTerms.js
 create mode 100644 js/src/hooks/useAllowEnhancedConversions.js
 create mode 100644 js/src/product-feed/submission-success-guide/EnhancedConversion.js
 create mode 100644 js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js

diff --git a/js/src/data/action-types.js b/js/src/data/action-types.js
index 86556c5fda..7f54b4b323 100644
--- a/js/src/data/action-types.js
+++ b/js/src/data/action-types.js
@@ -49,6 +49,8 @@ const TYPES = {
 	RECEIVE_TOUR: 'RECEIVE_TOUR',
 	UPSERT_TOUR: 'UPSERT_TOUR',
 	HYDRATE_PREFETCHED_DATA: 'HYDRATE_PREFETCHED_DATA',
+	RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS:
+		'RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS',
 };
 
 export default TYPES;
diff --git a/js/src/data/actions.js b/js/src/data/actions.js
index 8aba535605..97acd252cb 100644
--- a/js/src/data/actions.js
+++ b/js/src/data/actions.js
@@ -578,6 +578,13 @@ export function receiveGoogleMCContactInformation( data ) {
 	};
 }
 
+export function receiveAcceptedTerms( data ) {
+	return {
+		type: TYPES.RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS,
+		data,
+	};
+}
+
 /**
  * Update the contact information to user's account of Google Merchant Center.
  * It will update the store address of WooCommerce Settings to Google Merchant Center if they are different.
diff --git a/js/src/data/reducer.js b/js/src/data/reducer.js
index daf7b223e2..ac6ebc35d3 100644
--- a/js/src/data/reducer.js
+++ b/js/src/data/reducer.js
@@ -64,6 +64,10 @@ const DEFAULT_STATE = {
 	report: {},
 	store_categories: [],
 	tours: {},
+	conversion_tracking_setting: {
+		accepted_customer_data_terms: false,
+		allow_enhanced_conversions: false,
+	},
 };
 
 /**
@@ -491,6 +495,18 @@ const reducer = ( state = DEFAULT_STATE, action ) => {
 			return stateSetter.end();
 		}
 
+		case TYPES.RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS: {
+			const {
+				data: { status },
+			} = action;
+
+			return setIn(
+				state,
+				'conversion_tracking_setting.accepted_customer_data_terms',
+				status
+			);
+		}
+
 		// Page will be reloaded after all accounts have been disconnected, so no need to mutate state.
 		case TYPES.DISCONNECT_ACCOUNTS_ALL:
 		default:
diff --git a/js/src/data/resolvers.js b/js/src/data/resolvers.js
index 37f4a564d5..268450bf31 100644
--- a/js/src/data/resolvers.js
+++ b/js/src/data/resolvers.js
@@ -45,6 +45,7 @@ import {
 	receiveMappingRules,
 	receiveStoreCategories,
 	receiveTour,
+	receiveAcceptedTerms,
 } from './actions';
 
 export function* getShippingRates() {
@@ -470,13 +471,13 @@ getMappingRules.shouldInvalidate = ( action ) => {
 /**
  * Resolver for getting the Store categories.
  */
-export function* getStoreCategories() {
+export function* getAcceptedCustomerDataTerms() {
 	try {
 		const response = yield apiFetch( {
-			path: `${ API_NAMESPACE }/mc/mapping/categories`,
+			path: `${ API_NAMESPACE }/ads/accepted-customer-data-terms`,
 		} );
 
-		yield receiveStoreCategories( response );
+		yield receiveAcceptedTerms( response );
 	} catch ( error ) {
 		handleApiError(
 			error,
@@ -519,3 +520,24 @@ export function* getTour( tourId ) {
 		);
 	}
 }
+
+/**
+ * Resolver for getting the Store categories.
+ */
+export function* getStoreCategories() {
+	try {
+		const response = yield apiFetch( {
+			path: `${ API_NAMESPACE }/mc/mapping/categories`,
+		} );
+
+		yield receiveStoreCategories( response );
+	} catch ( error ) {
+		handleApiError(
+			error,
+			__(
+				'There was an error getting the store categories.',
+				'google-listings-and-ads'
+			)
+		);
+	}
+}
diff --git a/js/src/data/selectors.js b/js/src/data/selectors.js
index 181fb6c427..8498da7aa0 100644
--- a/js/src/data/selectors.js
+++ b/js/src/data/selectors.js
@@ -400,3 +400,13 @@ export const getStoreCategories = ( state ) => {
 export const getTour = ( state, tourId ) => {
 	return state.tours[ tourId ] || null;
 };
+
+export const getAcceptedCustomerDataTerms = ( state ) => {
+	return (
+		state.conversion_tracking_setting.accepted_customer_data_terms || false
+	);
+};
+
+export const getAllowEnhanceConversions = ( state ) => {
+	return state.allow_enhanced_conversions || false;
+};
diff --git a/js/src/external-components/wordpress/guide/index.js b/js/src/external-components/wordpress/guide/index.js
index de07985dfd..fd7d805d25 100644
--- a/js/src/external-components/wordpress/guide/index.js
+++ b/js/src/external-components/wordpress/guide/index.js
@@ -135,6 +135,9 @@ export default function Guide( {
 							{ backButtonText || __( 'Previous' ) }
 						</Button>
 					) }
+
+					{ pages[ currentPage ]?.footer }
+
 					{ canGoForward && (
 						<Button
 							className="components-guide__forward-button"
@@ -143,6 +146,7 @@ export default function Guide( {
 							{ __( 'Next' ) }
 						</Button>
 					) }
+
 					{ finishBlock }
 				</div>
 			</div>
diff --git a/js/src/hooks/useAcceptedCustomerDataTerms.js b/js/src/hooks/useAcceptedCustomerDataTerms.js
new file mode 100644
index 0000000000..fc267947ad
--- /dev/null
+++ b/js/src/hooks/useAcceptedCustomerDataTerms.js
@@ -0,0 +1,23 @@
+/**
+ * External dependencies
+ */
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { STORE_KEY } from '.~/data/constants';
+
+const useAcceptedCustomerDataTerms = () => {
+	return useSelect( ( select ) => {
+		const acceptedCustomerDataTerms =
+			select( STORE_KEY ).getAcceptedCustomerDataTerms();
+		const isResolving = select( STORE_KEY ).isResolving(
+			'getAcceptedCustomerDataTerms'
+		);
+
+		return { acceptedCustomerDataTerms, isResolving };
+	}, [] );
+};
+
+export default useAcceptedCustomerDataTerms;
diff --git a/js/src/hooks/useAllowEnhancedConversions.js b/js/src/hooks/useAllowEnhancedConversions.js
new file mode 100644
index 0000000000..6363f6ee9a
--- /dev/null
+++ b/js/src/hooks/useAllowEnhancedConversions.js
@@ -0,0 +1,23 @@
+/**
+ * External dependencies
+ */
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { STORE_KEY } from '.~/data/constants';
+
+const useAllowEnhancedConversions = () => {
+	return useSelect( ( select ) => {
+		const allowEnhanceConversions =
+			select( STORE_KEY ).getAllowEnhanceConversions();
+		const isResolving = select( STORE_KEY ).isResolving(
+			'getAllowEnhanceConversions'
+		);
+
+		return { allowEnhanceConversions, isResolving };
+	}, [] );
+};
+
+export default useAllowEnhancedConversions;
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversion.js b/js/src/product-feed/submission-success-guide/EnhancedConversion.js
new file mode 100644
index 0000000000..e4f5822ab2
--- /dev/null
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversion.js
@@ -0,0 +1,57 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { createInterpolateElement } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import GuidePageContent from '.~/components/guide-page-content';
+import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+
+const EnhancedConversion = () => {
+	const { acceptedCustomerDataTerms: hasAcceptedTerms } =
+		useAcceptedCustomerDataTerms();
+
+	return (
+		<GuidePageContent
+			title={ __(
+				'Optimize your conversion tracking with Enhanced Conversions',
+				'google-listings-and-ads'
+			) }
+		>
+			<p>
+				{ createInterpolateElement(
+					__(
+						'Enhance your conversion tracking accuracy and empower your bidding strategy with our latest feature: <b>Enhanced Conversion Tracking</b>. This feature seamlessly integrates with your existing conversion tags, ensuring the secure and privacy-conscious transmission of conversion data from your website to Google',
+						'google-listings-and-ads'
+					),
+					{
+						b: <b />,
+					}
+				) }
+			</p>
+
+			{ hasAcceptedTerms && (
+				<p>
+					{ __(
+						'Clicking confirm will enable Enhanced Conversions on your account and update your tags accordingly. This feature can also be managed from Google Listings & Ads > Settings',
+						'google-listings-and-ads'
+					) }
+				</p>
+			) }
+
+			{ ! hasAcceptedTerms && (
+				<p>
+					{ __(
+						'Activating it is easy – just agree to the terms of service on Google Ads and we will make the tagging changes needed for you. This feature can also be managed from Google Listings & Ads > Settings',
+						'google-listings-and-ads'
+					) }
+				</p>
+			) }
+		</GuidePageContent>
+	);
+};
+
+export default EnhancedConversion;
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
new file mode 100644
index 0000000000..edf1842354
--- /dev/null
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
@@ -0,0 +1,40 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useCallback } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import AppButton from '.~/components/app-button';
+import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+
+const EnhancedConversionFooter = () => {
+	const { acceptedCustomerDataTerms: hasAcceptedTerms } =
+		useAcceptedCustomerDataTerms();
+
+	const handleOnClick = useCallback( () => {
+		if ( hasAcceptedTerms ) {
+			console.log( 'jere' );
+		}
+	}, [ hasAcceptedTerms ] );
+
+	return (
+		<>
+			<div className="gla-submission-success-guide__space_holder" />
+			<AppButton onClick={ handleOnClick } isPrimary>
+				{ ! hasAcceptedTerms &&
+					__(
+						'Sign terms of service on Google Ads',
+						'google-listings-and-ads'
+					) }
+
+				{ hasAcceptedTerms &&
+					__( 'Confirm', 'google-listings-and-ads' ) }
+			</AppButton>
+		</>
+	);
+};
+
+export default EnhancedConversionFooter;
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index a6569d9ed7..75a94f1384 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -24,6 +24,8 @@ import { getProductFeedUrl } from '.~/utils/urls';
 import wooLogoURL from './woocommerce-logo.svg';
 import googleLogoURL from '.~/images/google-logo.svg';
 import { recordGlaEvent } from '.~/utils/tracks';
+import EnhancedConversion from './EnhancedConversion';
+import EnhancedConversionFooter from './EnhancedConversionFooter';
 import './index.scss';
 
 const EVENT_NAME = 'gla_modal_closed';
@@ -50,6 +52,19 @@ const image = (
 	</div>
 );
 
+const handleGuideFinish = ( e ) => {
+	getHistory().replace( getProductFeedUrl() );
+
+	// Since there is no built-in way to distinguish the modal/guide is closed by what action,
+	// here is a workaround by identifying the close button's data-aciton attribute.
+	const target = e.currentTarget || e.target;
+	const action = target.dataset.action || 'dismiss';
+	recordGlaEvent( EVENT_NAME, {
+		context: GUIDE_NAMES.SUBMISSION_SUCCESS,
+		action,
+	} );
+};
+
 const pages = [
 	{
 		image,
@@ -123,6 +138,35 @@ const pages = [
 				</cite>
 			</GuidePageContent>
 		),
+		footer: (
+			<>
+				<div className="gla-submission-success-guide__space_holder" />
+				<AppButton
+					isSecondary
+					data-action="maybe-later"
+					onClick={ handleGuideFinish }
+				>
+					{ __( 'Maybe later', 'google-listings-and-ads' ) }
+				</AppButton>
+				<AddPaidCampaignButton
+					isPrimary
+					isSecondary={ false }
+					isSmall={ false }
+					eventName={ EVENT_NAME }
+					eventProps={ {
+						context: GUIDE_NAMES.SUBMISSION_SUCCESS,
+						action: 'create-paid-campaign',
+					} }
+				>
+					{ __( 'Create paid campaign', 'google-listings-and-ads' ) }
+				</AddPaidCampaignButton>
+			</>
+		),
+	},
+	{
+		image,
+		content: <EnhancedConversion />,
+		footer: <EnhancedConversionFooter />,
 	},
 ];
 
@@ -130,19 +174,6 @@ if ( glaData.adsSetupComplete ) {
 	pages.pop();
 }
 
-const handleGuideFinish = ( e ) => {
-	getHistory().replace( getProductFeedUrl() );
-
-	// Since there is no built-in way to distinguish the modal/guide is closed by what action,
-	// here is a workaround by identifying the close button's data-aciton attribute.
-	const target = e.currentTarget || e.target;
-	const action = target.dataset.action || 'dismiss';
-	recordGlaEvent( EVENT_NAME, {
-		context: GUIDE_NAMES.SUBMISSION_SUCCESS,
-		action,
-	} );
-};
-
 /**
  * Modal window to greet the user at Product Feed, after successful completion of onboarding.
  *
@@ -178,31 +209,6 @@ const SubmissionSuccessGuide = () => {
 				</AppButton>
 			);
 		}
-
-		return (
-			<>
-				<div className="gla-submission-success-guide__space_holder" />
-				<AppButton
-					isSecondary
-					data-action="maybe-later"
-					onClick={ handleGuideFinish }
-				>
-					{ __( 'Maybe later', 'google-listings-and-ads' ) }
-				</AppButton>
-				<AddPaidCampaignButton
-					isPrimary
-					isSecondary={ false }
-					isSmall={ false }
-					eventName={ EVENT_NAME }
-					eventProps={ {
-						context: GUIDE_NAMES.SUBMISSION_SUCCESS,
-						action: 'create-paid-campaign',
-					} }
-				>
-					{ __( 'Create paid campaign', 'google-listings-and-ads' ) }
-				</AddPaidCampaignButton>
-			</>
-		);
 	}, [] );
 
 	return (
diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index 5f5f2ef54c..566bf17f94 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -18,6 +18,7 @@
 use Google\Ads\GoogleAds\V14\Enums\MerchantCenterLinkStatusEnum\MerchantCenterLinkStatus;
 use Google\Ads\GoogleAds\V14\Resources\MerchantCenterLink;
 use Google\Ads\GoogleAds\V14\Services\MerchantCenterLinkOperation;
+use Google\Ads\GoogleAds\V14\Resources\ConversionTrackingSetting;
 use Google\ApiCore\ApiException;
 use Google\ApiCore\ValidationException;
 
@@ -323,4 +324,11 @@ private function get_merchant_link( int $merchant_id ): MerchantCenterLink {
 
 		throw new Exception( __( 'Merchant link is not available to accept', 'google-listings-and-ads' ) );
 	}
+	
+	public function get_accepted_customer_data_terms(): bool | string {
+		return $this->client->getCustomerServiceClient()->accepted_customer_data_terms;
+		$conversion_tracking_setting = new ConversionTrackingSetting();
+		
+		return $conversion_tracking_setting->getEnhancedConversionsForLeadsEnabled();
+	}
 }
diff --git a/src/API/Site/Controllers/Ads/AccountController.php b/src/API/Site/Controllers/Ads/AccountController.php
index 59a88c8574..cc3c1735d3 100644
--- a/src/API/Site/Controllers/Ads/AccountController.php
+++ b/src/API/Site/Controllers/Ads/AccountController.php
@@ -86,6 +86,17 @@ public function register_routes(): void {
 				],
 			]
 		);
+
+		$this->register_route(
+			'ads/accepted-customer-data-terms',
+			[
+				[
+					'methods'             => TransportMethods::READABLE,
+					'callback'            => $this->get_accepted_customer_data_terms_callback(),
+					'permission_callback' => $this->get_permission_callback(),
+				],
+			]
+		);
 	}
 
 	/**
@@ -162,6 +173,17 @@ protected function get_billing_status_callback(): callable {
 		};
 	}
 
+	/**
+	 * Get the callback function for retrieving the billing setup status.
+	 *
+	 * @return callable
+	 */
+	protected function get_accepted_customer_data_terms_callback(): callable {
+		return function () {
+			return $this->account->get_accepted_customer_data_terms();
+		};
+	}
+
 	/**
 	 * Get the item schema for the controller.
 	 *
diff --git a/src/Ads/AccountService.php b/src/Ads/AccountService.php
index c0434e7f7b..b4f2101f94 100644
--- a/src/Ads/AccountService.php
+++ b/src/Ads/AccountService.php
@@ -277,4 +277,17 @@ private function create_conversion_action(): void {
 		$action = $this->container->get( AdsConversionAction::class )->create_conversion_action();
 		$this->options->update( OptionsInterface::ADS_CONVERSION_ACTION, $action );
 	}
+
+	/**
+	 * Gets the billing setup status and returns a setup URL if available.
+	 *
+	 * @return array
+	 */
+	public function get_accepted_customer_data_terms(): array {
+		$status = $this->container->get( Ads::class )->get_accepted_customer_data_terms();
+
+		return [
+			'status' => $status,
+		];
+	}
 }

From f225bdd69248900fb6fe20f26bb53e053ac1a9eb Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Fri, 2 Feb 2024 19:36:13 +0400
Subject: [PATCH 02/95] Get correct value from API for accepted terms.

---
 js/src/hooks/useAcceptedCustomerDataTerms.js  |  9 ++++-
 .../EnhancedConversion.js                     |  3 ++
 .../EnhancedConversionFooter.js               | 31 ++++++++------
 src/API/Google/Ads.php                        | 40 ++++++++++++++++---
 4 files changed, 65 insertions(+), 18 deletions(-)

diff --git a/js/src/hooks/useAcceptedCustomerDataTerms.js b/js/src/hooks/useAcceptedCustomerDataTerms.js
index fc267947ad..99b386805d 100644
--- a/js/src/hooks/useAcceptedCustomerDataTerms.js
+++ b/js/src/hooks/useAcceptedCustomerDataTerms.js
@@ -15,8 +15,15 @@ const useAcceptedCustomerDataTerms = () => {
 		const isResolving = select( STORE_KEY ).isResolving(
 			'getAcceptedCustomerDataTerms'
 		);
+		const hasFinishedResolution = select( STORE_KEY ).hasFinishedResolution(
+			'getAcceptedCustomerDataTerms'
+		);
 
-		return { acceptedCustomerDataTerms, isResolving };
+		return {
+			acceptedCustomerDataTerms,
+			isResolving,
+			hasFinishedResolution,
+		};
 	}, [] );
 };
 
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversion.js b/js/src/product-feed/submission-success-guide/EnhancedConversion.js
index e4f5822ab2..260e6a38aa 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversion.js
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversion.js
@@ -9,10 +9,13 @@ import { createInterpolateElement } from '@wordpress/element';
  */
 import GuidePageContent from '.~/components/guide-page-content';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+import useGoogleAccount from '.~/hooks/useGoogleAccount';
 
 const EnhancedConversion = () => {
 	const { acceptedCustomerDataTerms: hasAcceptedTerms } =
 		useAcceptedCustomerDataTerms();
+	const { google } = useGoogleAccount();
+	console.log( google );
 
 	return (
 		<GuidePageContent
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
index edf1842354..3f6b724ea7 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
@@ -11,8 +11,10 @@ import AppButton from '.~/components/app-button';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 
 const EnhancedConversionFooter = () => {
-	const { acceptedCustomerDataTerms: hasAcceptedTerms } =
-		useAcceptedCustomerDataTerms();
+	const {
+		acceptedCustomerDataTerms: hasAcceptedTerms,
+		hasFinishedResolution,
+	} = useAcceptedCustomerDataTerms();
 
 	const handleOnClick = useCallback( () => {
 		if ( hasAcceptedTerms ) {
@@ -23,16 +25,21 @@ const EnhancedConversionFooter = () => {
 	return (
 		<>
 			<div className="gla-submission-success-guide__space_holder" />
-			<AppButton onClick={ handleOnClick } isPrimary>
-				{ ! hasAcceptedTerms &&
-					__(
-						'Sign terms of service on Google Ads',
-						'google-listings-and-ads'
-					) }
-
-				{ hasAcceptedTerms &&
-					__( 'Confirm', 'google-listings-and-ads' ) }
-			</AppButton>
+
+			{ ! hasFinishedResolution && <AppButton isPrimary loading /> }
+
+			{ hasFinishedResolution && (
+				<AppButton onClick={ handleOnClick } isPrimary>
+					{ ! hasAcceptedTerms &&
+						__(
+							'Sign terms of service on Google Ads',
+							'google-listings-and-ads'
+						) }
+
+					{ hasAcceptedTerms &&
+						__( 'Confirm', 'google-listings-and-ads' ) }
+				</AppButton>
+			) }
 		</>
 	);
 };
diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index 566bf17f94..b9b47739bd 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -325,10 +325,40 @@ private function get_merchant_link( int $merchant_id ): MerchantCenterLink {
 		throw new Exception( __( 'Merchant link is not available to accept', 'google-listings-and-ads' ) );
 	}
 	
-	public function get_accepted_customer_data_terms(): bool | string {
-		return $this->client->getCustomerServiceClient()->accepted_customer_data_terms;
-		$conversion_tracking_setting = new ConversionTrackingSetting();
-		
-		return $conversion_tracking_setting->getEnhancedConversionsForLeadsEnabled();
+	/**
+	 * Check if the user has accepted the customer data terms for enhanced conversion tracking.
+	 * Returns false for any account that fails.
+	 *
+	 * @return boolean
+	 */
+	public function get_accepted_customer_data_terms(): bool | int | string | array {
+		$ads_id = $this->options->get_ads_id();
+
+		try {
+			$customer = ( new AdsAccountQuery() )
+				->set_client( $this->client, $ads_id )
+				->columns( [ 'customer.conversion_tracking_setting.accepted_customer_data_terms', 'customer.conversion_tracking_setting.conversion_tracking_id', 'customer.conversion_tracking_setting.google_ads_conversion_customer', 'customer.id', 'customer.conversion_tracking_setting.conversion_tracking_status' ] )
+				->get_result()
+				->getCustomer();
+
+			if ( ! $customer ) {
+				return false;
+			}
+
+			$conversion_tracking_setting = $customer->getConversionTrackingSetting();
+
+			// return [
+			// 	'tracking_id' => $conversion_tracking_setting->getConversionTrackingId(),
+			// 	'tracking_status' => $conversion_tracking_setting->getConversionTrackingStatus(),
+			// 	'google_ads_conversion_customer' => $conversion_tracking_setting->getGoogleAdsConversionCustomer(),
+			// 	'id' => $customer->getId(),
+			// ];
+
+			return $conversion_tracking_setting->getAcceptedCustomerDataTerms();
+		} catch ( ApiException $e ) {
+			do_action( 'woocommerce_gla_ads_client_exception', $e, __METHOD__ );
+		}
+
+		return false;
 	}
 }

From 41754d08d8d6f7cf34623b8444f7a853852d4bf0 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 6 Feb 2024 16:26:32 +0400
Subject: [PATCH 03/95] Add comments to the selectors.

---
 js/src/data/reducer.js                          | 10 ++++++----
 js/src/data/resolvers.js                        | 16 ++++++++--------
 js/src/data/selectors.js                        | 17 +++++++++++++++--
 .../EnhancedConversion.js                       |  3 ---
 .../EnhancedConversionFooter.js                 |  2 +-
 src/API/Google/Ads.php                          | 11 ++---------
 6 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/js/src/data/reducer.js b/js/src/data/reducer.js
index ac6ebc35d3..82a7fbd874 100644
--- a/js/src/data/reducer.js
+++ b/js/src/data/reducer.js
@@ -64,9 +64,11 @@ const DEFAULT_STATE = {
 	report: {},
 	store_categories: [],
 	tours: {},
-	conversion_tracking_setting: {
-		accepted_customer_data_terms: false,
-		allow_enhanced_conversions: false,
+	ads: {
+		conversion_tracking_setting: {
+			accepted_customer_data_terms: false,
+			allow_enhanced_conversions: false,
+		},
 	},
 };
 
@@ -502,7 +504,7 @@ const reducer = ( state = DEFAULT_STATE, action ) => {
 
 			return setIn(
 				state,
-				'conversion_tracking_setting.accepted_customer_data_terms',
+				'ads.conversion_tracking_setting.accepted_customer_data_terms',
 				status
 			);
 		}
diff --git a/js/src/data/resolvers.js b/js/src/data/resolvers.js
index 268450bf31..09ead00f95 100644
--- a/js/src/data/resolvers.js
+++ b/js/src/data/resolvers.js
@@ -471,13 +471,13 @@ getMappingRules.shouldInvalidate = ( action ) => {
 /**
  * Resolver for getting the Store categories.
  */
-export function* getAcceptedCustomerDataTerms() {
+export function* getStoreCategories() {
 	try {
 		const response = yield apiFetch( {
-			path: `${ API_NAMESPACE }/ads/accepted-customer-data-terms`,
+			path: `${ API_NAMESPACE }/mc/mapping/categories`,
 		} );
 
-		yield receiveAcceptedTerms( response );
+		yield receiveStoreCategories( response );
 	} catch ( error ) {
 		handleApiError(
 			error,
@@ -522,20 +522,20 @@ export function* getTour( tourId ) {
 }
 
 /**
- * Resolver for getting the Store categories.
+ * Resolver for getting the accepted customer data terms.
  */
-export function* getStoreCategories() {
+export function* getAcceptedCustomerDataTerms() {
 	try {
 		const response = yield apiFetch( {
-			path: `${ API_NAMESPACE }/mc/mapping/categories`,
+			path: `${ API_NAMESPACE }/ads/accepted-customer-data-terms`,
 		} );
 
-		yield receiveStoreCategories( response );
+		yield receiveAcceptedTerms( response );
 	} catch ( error ) {
 		handleApiError(
 			error,
 			__(
-				'There was an error getting the store categories.',
+				'There was an error getting the accepted customer data terms.',
 				'google-listings-and-ads'
 			)
 		);
diff --git a/js/src/data/selectors.js b/js/src/data/selectors.js
index 8498da7aa0..510157dd6e 100644
--- a/js/src/data/selectors.js
+++ b/js/src/data/selectors.js
@@ -401,12 +401,25 @@ export const getTour = ( state, tourId ) => {
 	return state.tours[ tourId ] || null;
 };
 
+/**
+ * Return the customer accepted data terms.
+ *
+ * @param {Object} state The state
+ * @return {boolean} TRUE if the user signed the TOS.
+ */
 export const getAcceptedCustomerDataTerms = ( state ) => {
 	return (
-		state.conversion_tracking_setting.accepted_customer_data_terms || false
+		state.ads.conversion_tracking_setting.accepted_customer_data_terms ||
+		false
 	);
 };
 
+/**
+ * Return whether the user allowed enhanced conversion tracking.
+ *
+ * @param {Object} state The state
+ * @return {boolean} TRUE if the user allowed enhanced conversion tracking.
+ */
 export const getAllowEnhanceConversions = ( state ) => {
-	return state.allow_enhanced_conversions || false;
+	return state.ads.allow_enhanced_conversions || false;
 };
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversion.js b/js/src/product-feed/submission-success-guide/EnhancedConversion.js
index 260e6a38aa..e4f5822ab2 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversion.js
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversion.js
@@ -9,13 +9,10 @@ import { createInterpolateElement } from '@wordpress/element';
  */
 import GuidePageContent from '.~/components/guide-page-content';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
-import useGoogleAccount from '.~/hooks/useGoogleAccount';
 
 const EnhancedConversion = () => {
 	const { acceptedCustomerDataTerms: hasAcceptedTerms } =
 		useAcceptedCustomerDataTerms();
-	const { google } = useGoogleAccount();
-	console.log( google );
 
 	return (
 		<GuidePageContent
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
index 3f6b724ea7..259baffb17 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
@@ -18,7 +18,7 @@ const EnhancedConversionFooter = () => {
 
 	const handleOnClick = useCallback( () => {
 		if ( hasAcceptedTerms ) {
-			console.log( 'jere' );
+			console.log( 'Redirect the user to the TOS page.' );
 		}
 	}, [ hasAcceptedTerms ] );
 
diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index b9b47739bd..7b67b8df7a 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -331,13 +331,13 @@ private function get_merchant_link( int $merchant_id ): MerchantCenterLink {
 	 *
 	 * @return boolean
 	 */
-	public function get_accepted_customer_data_terms(): bool | int | string | array {
+	public function get_accepted_customer_data_terms(): bool {
 		$ads_id = $this->options->get_ads_id();
 
 		try {
 			$customer = ( new AdsAccountQuery() )
 				->set_client( $this->client, $ads_id )
-				->columns( [ 'customer.conversion_tracking_setting.accepted_customer_data_terms', 'customer.conversion_tracking_setting.conversion_tracking_id', 'customer.conversion_tracking_setting.google_ads_conversion_customer', 'customer.id', 'customer.conversion_tracking_setting.conversion_tracking_status' ] )
+				->columns( [ 'customer.conversion_tracking_setting.accepted_customer_data_terms' ] )
 				->get_result()
 				->getCustomer();
 
@@ -347,13 +347,6 @@ public function get_accepted_customer_data_terms(): bool | int | string | array
 
 			$conversion_tracking_setting = $customer->getConversionTrackingSetting();
 
-			// return [
-			// 	'tracking_id' => $conversion_tracking_setting->getConversionTrackingId(),
-			// 	'tracking_status' => $conversion_tracking_setting->getConversionTrackingStatus(),
-			// 	'google_ads_conversion_customer' => $conversion_tracking_setting->getGoogleAdsConversionCustomer(),
-			// 	'id' => $customer->getId(),
-			// ];
-
 			return $conversion_tracking_setting->getAcceptedCustomerDataTerms();
 		} catch ( ApiException $e ) {
 			do_action( 'woocommerce_gla_ads_client_exception', $e, __METHOD__ );

From 6302778082a5c565f506838f1f9bbc52cc7082b8 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 6 Feb 2024 20:07:01 +0400
Subject: [PATCH 04/95] Try to filter out the difference screens.

---
 .../EnhancedConversion.js                     | 10 ++++++
 .../EnhancedConversionFooter.js               | 10 ++++++
 .../submission-success-guide/index.js         | 36 ++++++++++++++-----
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversion.js b/js/src/product-feed/submission-success-guide/EnhancedConversion.js
index e4f5822ab2..007cf978bd 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversion.js
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversion.js
@@ -7,13 +7,23 @@ import { createInterpolateElement } from '@wordpress/element';
 /**
  * Internal dependencies
  */
+import { GOOGLE_ADS_ACCOUNT_STATUS } from '.~/constants';
+import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
 import GuidePageContent from '.~/components/guide-page-content';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 
 const EnhancedConversion = () => {
+	const { googleAdsAccount } = useGoogleAdsAccount();
 	const { acceptedCustomerDataTerms: hasAcceptedTerms } =
 		useAcceptedCustomerDataTerms();
 
+	if (
+		! googleAdsAccount ||
+		googleAdsAccount?.status !== GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED
+	) {
+		return null;
+	}
+
 	return (
 		<GuidePageContent
 			title={ __(
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
index 259baffb17..be5f576c74 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
@@ -7,10 +7,13 @@ import { useCallback } from '@wordpress/element';
 /**
  * Internal dependencies
  */
+import { GOOGLE_ADS_ACCOUNT_STATUS } from '.~/constants';
 import AppButton from '.~/components/app-button';
+import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 
 const EnhancedConversionFooter = () => {
+	const { googleAdsAccount } = useGoogleAdsAccount();
 	const {
 		acceptedCustomerDataTerms: hasAcceptedTerms,
 		hasFinishedResolution,
@@ -22,6 +25,13 @@ const EnhancedConversionFooter = () => {
 		}
 	}, [ hasAcceptedTerms ] );
 
+	if (
+		! googleAdsAccount ||
+		googleAdsAccount?.status !== GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED
+	) {
+		return null;
+	}
+
 	return (
 		<>
 			<div className="gla-submission-success-guide__space_holder" />
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index 75a94f1384..ea97b0b162 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -12,6 +12,8 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
+import SpinnerCard from '.~/components/spinner-card';
+import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
 import Guide from '.~/external-components/wordpress/guide';
 import GuidePageContent, {
 	ContentLink,
@@ -29,6 +31,10 @@ import EnhancedConversionFooter from './EnhancedConversionFooter';
 import './index.scss';
 
 const EVENT_NAME = 'gla_modal_closed';
+const SUCCESS_SCREEN = 'success-screen';
+const GOOGLE_ADS_CREDITS_SCREEN = 'google-ads-credits-screen';
+const ENHANCED_CONVERSION_TRACKING_SCREEN =
+	'enhanced-conversion-tracking-screen';
 
 const image = (
 	<div className="gla-submission-success-guide__logo-block">
@@ -65,8 +71,8 @@ const handleGuideFinish = ( e ) => {
 	} );
 };
 
-const pages = [
-	{
+const PAGES = {
+	[ SUCCESS_SCREEN ]: {
 		image,
 		content: (
 			<GuidePageContent
@@ -105,7 +111,7 @@ const pages = [
 			</GuidePageContent>
 		),
 	},
-	{
+	[ GOOGLE_ADS_CREDITS_SCREEN ]: {
 		image,
 		content: (
 			<GuidePageContent
@@ -163,16 +169,12 @@ const pages = [
 			</>
 		),
 	},
-	{
+	[ ENHANCED_CONVERSION_TRACKING_SCREEN ]: {
 		image,
 		content: <EnhancedConversion />,
 		footer: <EnhancedConversionFooter />,
 	},
-];
-
-if ( glaData.adsSetupComplete ) {
-	pages.pop();
-}
+};
 
 /**
  * Modal window to greet the user at Product Feed, after successful completion of onboarding.
@@ -184,6 +186,8 @@ if ( glaData.adsSetupComplete ) {
  * @fires gla_modal_open with `context: GUIDE_NAMES.SUBMISSION_SUCCESS`
  */
 const SubmissionSuccessGuide = () => {
+	const { loaded, data: campaigns } = useAdsCampaigns();
+
 	useEffect( () => {
 		recordGlaEvent( 'gla_modal_open', {
 			context: GUIDE_NAMES.SUBMISSION_SUCCESS,
@@ -211,6 +215,20 @@ const SubmissionSuccessGuide = () => {
 		}
 	}, [] );
 
+	if ( glaData.adsSetupComplete ) {
+		// Remove the Google Ads credits screens.
+		delete PAGES?.[ GOOGLE_ADS_CREDITS_SCREEN ];
+	} else if ( ! campaigns?.length ) {
+		// There are no campaigns, do not show the enhanced conversion tracking screen.
+		delete PAGES?.[ ENHANCED_CONVERSION_TRACKING_SCREEN ];
+	}
+
+	if ( ! loaded ) {
+		return <SpinnerCard />;
+	}
+
+	const pages = Object.keys( PAGES ).map( ( screen ) => PAGES[ screen ] );
+
 	return (
 		<Guide
 			className="gla-submission-success-guide"

From bfb368ff8ab2c7cafe0dc65c4a84eecdcd129919 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 6 Feb 2024 20:09:07 +0400
Subject: [PATCH 05/95] Fix comment.

---
 src/Ads/AccountService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ads/AccountService.php b/src/Ads/AccountService.php
index b4f2101f94..803d54932a 100644
--- a/src/Ads/AccountService.php
+++ b/src/Ads/AccountService.php
@@ -279,7 +279,7 @@ private function create_conversion_action(): void {
 	}
 
 	/**
-	 * Gets the billing setup status and returns a setup URL if available.
+	 * Gets the accepted customer data terms status.
 	 *
 	 * @return array
 	 */

From dd662d9e3eb0d9264e931ef4fe955152ee81b0a4 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Fri, 9 Feb 2024 17:27:31 +0400
Subject: [PATCH 06/95] Fix failing tests. F

---
 js/src/constants.js                           |   7 +
 js/src/data/action-types.js                   |   2 +
 js/src/data/actions.js                        |  31 +++
 js/src/data/reducer.js                        |  19 +-
 js/src/data/selectors.js                      |   7 +-
 js/src/data/test/reducer.test.js              |   6 +
 .../EnhancedConversion.js                     |  27 ++-
 .../EnhancedConversionFooter.js               |  38 ++--
 .../submission-success-guide/index.js         | 180 ++++++++++--------
 src/API/Google/Ads.php                        |  16 +-
 .../Controllers/Ads/AccountController.php     |  30 ++-
 src/Ads/AccountService.php                    |  15 ++
 12 files changed, 259 insertions(+), 119 deletions(-)

diff --git a/js/src/constants.js b/js/src/constants.js
index 0cce0f2c3d..e64c4c9463 100644
--- a/js/src/constants.js
+++ b/js/src/constants.js
@@ -111,3 +111,10 @@ export const ASSET_FORM_KEY = {
 	...ASSET_KEY,
 	...ASSET_GROUP_KEY,
 };
+
+export const ENHANCED_ADS_CONVERSION_STATUS = {
+	UNKNOWN: 'unknown',
+	PENDING: 'pending',
+	ENABLED: 'enabled',
+	DISABLED: 'disabled',
+};
diff --git a/js/src/data/action-types.js b/js/src/data/action-types.js
index 7f54b4b323..9eaf1d67ea 100644
--- a/js/src/data/action-types.js
+++ b/js/src/data/action-types.js
@@ -51,6 +51,8 @@ const TYPES = {
 	HYDRATE_PREFETCHED_DATA: 'HYDRATE_PREFETCHED_DATA',
 	RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS:
 		'RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS',
+	UPDATE_ENHANCED_ADS_CONVERSION_STATUS:
+		'UPDATE_ENHANCED_ADS_CONVERSION_STATUS',
 };
 
 export default TYPES;
diff --git a/js/src/data/actions.js b/js/src/data/actions.js
index 97acd252cb..cbf441f069 100644
--- a/js/src/data/actions.js
+++ b/js/src/data/actions.js
@@ -1254,3 +1254,34 @@ export function* upsertTour( tour, upsertingClientStoreFirst = false ) {
 		);
 	}
 }
+
+/**
+ * Updates the enhanced ads conversion status.
+ *
+ * @param {string} status to enable/disable enhanced ads conversion. Possible values are pending, enabled and disabled.
+ * @return {boolean} String The updated status.
+ */
+export function* updateEnhancedAdsConversionStatus( status ) {
+	try {
+		const response = yield apiFetch( {
+			path: `${ API_NAMESPACE }/ads/update-enhanced-conversion-status`,
+			method: REQUEST_ACTIONS.POST,
+			data: {
+				status,
+			},
+		} );
+
+		return {
+			type: TYPES.UPDATE_ENHANCED_ADS_CONVERSION_STATUS,
+			response,
+		};
+	} catch ( error ) {
+		handleApiError(
+			error,
+			__(
+				'There was an error updating the enhanced ads conversion status.',
+				'google-listings-and-ads'
+			)
+		);
+	}
+}
diff --git a/js/src/data/reducer.js b/js/src/data/reducer.js
index 82a7fbd874..1101f73ee4 100644
--- a/js/src/data/reducer.js
+++ b/js/src/data/reducer.js
@@ -7,6 +7,7 @@ import { setWith, clone } from 'lodash';
  * Internal dependencies
  */
 import TYPES from './action-types';
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 
 const DEFAULT_STATE = {
 	general: {
@@ -66,8 +67,8 @@ const DEFAULT_STATE = {
 	tours: {},
 	ads: {
 		conversion_tracking_setting: {
-			accepted_customer_data_terms: false,
-			allow_enhanced_conversions: false,
+			accepted_customer_data_terms: null,
+			allow_enhanced_conversions: null,
 		},
 	},
 };
@@ -509,6 +510,20 @@ const reducer = ( state = DEFAULT_STATE, action ) => {
 			);
 		}
 
+		case TYPES.UPDATE_ENHANCED_ADS_CONVERSION: {
+			const { status } = action;
+
+			if ( status === null || status === undefined ) {
+				return state;
+			}
+
+			return setIn(
+				state,
+				'ads.conversion_tracking_setting.allow_enhanced_conversions',
+				status
+			);
+		}
+
 		// Page will be reloaded after all accounts have been disconnected, so no need to mutate state.
 		case TYPES.DISCONNECT_ACCOUNTS_ALL:
 		default:
diff --git a/js/src/data/selectors.js b/js/src/data/selectors.js
index 510157dd6e..17034d48d0 100644
--- a/js/src/data/selectors.js
+++ b/js/src/data/selectors.js
@@ -408,10 +408,7 @@ export const getTour = ( state, tourId ) => {
  * @return {boolean} TRUE if the user signed the TOS.
  */
 export const getAcceptedCustomerDataTerms = ( state ) => {
-	return (
-		state.ads.conversion_tracking_setting.accepted_customer_data_terms ||
-		false
-	);
+	return state.ads.conversion_tracking_setting.accepted_customer_data_terms;
 };
 
 /**
@@ -421,5 +418,5 @@ export const getAcceptedCustomerDataTerms = ( state ) => {
  * @return {boolean} TRUE if the user allowed enhanced conversion tracking.
  */
 export const getAllowEnhanceConversions = ( state ) => {
-	return state.ads.allow_enhanced_conversions || false;
+	return state.ads.allow_enhanced_conversions;
 };
diff --git a/js/src/data/test/reducer.test.js b/js/src/data/test/reducer.test.js
index 37eb44ba8a..aad87910cd 100644
--- a/js/src/data/test/reducer.test.js
+++ b/js/src/data/test/reducer.test.js
@@ -67,6 +67,12 @@ describe( 'reducer', () => {
 			report: {},
 			store_categories: [],
 			tours: {},
+			ads: {
+				conversion_tracking_setting: {
+					accepted_customer_data_terms: null,
+					allow_enhanced_conversions: null,
+				},
+			},
 		} );
 
 		prepareState = prepareImmutableStateWithRefCheck.bind(
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversion.js b/js/src/product-feed/submission-success-guide/EnhancedConversion.js
index 007cf978bd..3d84af04e0 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversion.js
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversion.js
@@ -7,22 +7,15 @@ import { createInterpolateElement } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { GOOGLE_ADS_ACCOUNT_STATUS } from '.~/constants';
-import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
+import LoadingLabel from '.~/components/loading-label';
 import GuidePageContent from '.~/components/guide-page-content';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 
 const EnhancedConversion = () => {
-	const { googleAdsAccount } = useGoogleAdsAccount();
-	const { acceptedCustomerDataTerms: hasAcceptedTerms } =
-		useAcceptedCustomerDataTerms();
-
-	if (
-		! googleAdsAccount ||
-		googleAdsAccount?.status !== GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED
-	) {
-		return null;
-	}
+	const {
+		acceptedCustomerDataTerms: hasAcceptedTerms,
+		hasFinishedResolution,
+	} = useAcceptedCustomerDataTerms();
 
 	return (
 		<GuidePageContent
@@ -43,7 +36,13 @@ const EnhancedConversion = () => {
 				) }
 			</p>
 
-			{ hasAcceptedTerms && (
+			{ ! hasFinishedResolution && (
+				<LoadingLabel
+					text={ __( 'Please wait…', 'google-listings-and-ads' ) }
+				/>
+			) }
+
+			{ hasAcceptedTerms === true && (
 				<p>
 					{ __(
 						'Clicking confirm will enable Enhanced Conversions on your account and update your tags accordingly. This feature can also be managed from Google Listings & Ads > Settings',
@@ -52,7 +51,7 @@ const EnhancedConversion = () => {
 				</p>
 			) }
 
-			{ ! hasAcceptedTerms && (
+			{ hasAcceptedTerms === false && (
 				<p>
 					{ __(
 						'Activating it is easy – just agree to the terms of service on Google Ads and we will make the tagging changes needed for you. This feature can also be managed from Google Listings & Ads > Settings',
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
index be5f576c74..9eb99a6f46 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
@@ -7,30 +7,35 @@ import { useCallback } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { GOOGLE_ADS_ACCOUNT_STATUS } from '.~/constants';
+import { useAppDispatch } from '.~/data';
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import AppButton from '.~/components/app-button';
-import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 
-const EnhancedConversionFooter = () => {
-	const { googleAdsAccount } = useGoogleAdsAccount();
+const EnhancedConversionFooter = ( { handleGuideFinish } ) => {
+	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
 	const {
 		acceptedCustomerDataTerms: hasAcceptedTerms,
 		hasFinishedResolution,
 	} = useAcceptedCustomerDataTerms();
 
+	// @todo: Review URL
+	const TOS_URL = 'https://ads.google.com/aw/conversions/customersettings';
+
 	const handleOnClick = useCallback( () => {
 		if ( hasAcceptedTerms ) {
-			console.log( 'Redirect the user to the TOS page.' );
+			updateEnhancedAdsConversionStatus(
+				ENHANCED_ADS_CONVERSION_STATUS.ENABLED
+			);
+
+			return;
 		}
-	}, [ hasAcceptedTerms ] );
 
-	if (
-		! googleAdsAccount ||
-		googleAdsAccount?.status !== GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED
-	) {
-		return null;
-	}
+		window.open( TOS_URL, '_blank' );
+		updateEnhancedAdsConversionStatus(
+			ENHANCED_ADS_CONVERSION_STATUS.PENDING
+		);
+	}, [ hasAcceptedTerms, updateEnhancedAdsConversionStatus ] );
 
 	return (
 		<>
@@ -50,6 +55,15 @@ const EnhancedConversionFooter = () => {
 						__( 'Confirm', 'google-listings-and-ads' ) }
 				</AppButton>
 			) }
+
+			<AppButton
+				isSecondary
+				// @todo: review data-action label
+				data-action="view-product-feed"
+				onClick={ handleGuideFinish }
+			>
+				{ __( 'Close', 'google-listings-and-ads' ) }
+			</AppButton>
 		</>
 	);
 };
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index ea97b0b162..f2a8acafc5 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -12,7 +12,6 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import SpinnerCard from '.~/components/spinner-card';
 import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
 import Guide from '.~/external-components/wordpress/guide';
 import GuidePageContent, {
@@ -28,6 +27,7 @@ import googleLogoURL from '.~/images/google-logo.svg';
 import { recordGlaEvent } from '.~/utils/tracks';
 import EnhancedConversion from './EnhancedConversion';
 import EnhancedConversionFooter from './EnhancedConversionFooter';
+import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import './index.scss';
 
 const EVENT_NAME = 'gla_modal_closed';
@@ -110,70 +110,16 @@ const PAGES = {
 				</p>
 			</GuidePageContent>
 		),
-	},
-	[ GOOGLE_ADS_CREDITS_SCREEN ]: {
-		image,
-		content: (
-			<GuidePageContent
-				title={ __(
-					'Spend $500 to get $500 in Google Ads credits',
-					'google-listings-and-ads'
-				) }
-			>
-				<p>
-					{ __(
-						'New to Google Ads? Get $500 in ad credit when you spend $500 within your first 60 days* You can edit or cancel your campaign at any time.',
-						'google-listings-and-ads'
-					) }
-				</p>
-				<cite>
-					{ createInterpolateElement(
-						__(
-							'*Full terms and conditions <link>here</link>.',
-							'google-listings-and-ads'
-						),
-						{
-							link: (
-								<ContentLink
-									href="https://www.google.com/ads/coupons/terms/"
-									context="terms-of-ads-coupons"
-								/>
-							),
-						}
-					) }
-				</cite>
-			</GuidePageContent>
-		),
 		footer: (
-			<>
-				<div className="gla-submission-success-guide__space_holder" />
-				<AppButton
-					isSecondary
-					data-action="maybe-later"
-					onClick={ handleGuideFinish }
-				>
-					{ __( 'Maybe later', 'google-listings-and-ads' ) }
-				</AppButton>
-				<AddPaidCampaignButton
-					isPrimary
-					isSecondary={ false }
-					isSmall={ false }
-					eventName={ EVENT_NAME }
-					eventProps={ {
-						context: GUIDE_NAMES.SUBMISSION_SUCCESS,
-						action: 'create-paid-campaign',
-					} }
-				>
-					{ __( 'Create paid campaign', 'google-listings-and-ads' ) }
-				</AddPaidCampaignButton>
-			</>
+			<AppButton
+				isPrimary
+				data-action="view-product-feed"
+				onClick={ handleGuideFinish }
+			>
+				{ __( 'View product feed', 'google-listings-and-ads' ) }
+			</AppButton>
 		),
 	},
-	[ ENHANCED_CONVERSION_TRACKING_SCREEN ]: {
-		image,
-		content: <EnhancedConversion />,
-		footer: <EnhancedConversionFooter />,
-	},
 };
 
 /**
@@ -186,7 +132,10 @@ const PAGES = {
  * @fires gla_modal_open with `context: GUIDE_NAMES.SUBMISSION_SUCCESS`
  */
 const SubmissionSuccessGuide = () => {
-	const { loaded, data: campaigns } = useAdsCampaigns();
+	const { data: campaigns } = useAdsCampaigns();
+
+	// side effects
+	useAcceptedCustomerDataTerms();
 
 	useEffect( () => {
 		recordGlaEvent( 'gla_modal_open', {
@@ -201,30 +150,93 @@ const SubmissionSuccessGuide = () => {
 		);
 	}, [] );
 
-	const renderFinish = useCallback( () => {
-		if ( glaData.adsSetupComplete ) {
-			return (
-				<AppButton
-					isPrimary
-					data-action="view-product-feed"
-					onClick={ handleGuideFinish }
+	// @todo: Review whether we need that function since we have moved the buttons to be per page now.
+	const renderFinish = useCallback( () => null, [] );
+
+	const showEnhancedConversionTrackingScreen =
+		glaData.adsSetupComplete &&
+		! PAGES[ ENHANCED_CONVERSION_TRACKING_SCREEN ];
+
+	// @todo: Review logic to display credits screen. How do we get the paid campaigns?
+	const showGoogleAdsCreditsScreen =
+		! campaigns?.length && ! PAGES[ ENHANCED_CONVERSION_TRACKING_SCREEN ];
+
+	if ( showEnhancedConversionTrackingScreen ) {
+		// Add conversion screen if ads setup is complete
+		PAGES[ ENHANCED_CONVERSION_TRACKING_SCREEN ] = {
+			image,
+			content: <EnhancedConversion />,
+			footer: (
+				<EnhancedConversionFooter
+					handleGuideFinish={ handleGuideFinish }
+				/>
+			),
+		};
+	} else if ( showGoogleAdsCreditsScreen ) {
+		// There are no campaigns, add Google Ads credit screen
+		PAGES[ GOOGLE_ADS_CREDITS_SCREEN ] = {
+			image,
+			content: (
+				<GuidePageContent
+					title={ __(
+						'Spend $500 to get $500 in Google Ads credits',
+						'google-listings-and-ads'
+					) }
 				>
-					{ __( 'View product feed', 'google-listings-and-ads' ) }
-				</AppButton>
-			);
-		}
-	}, [] );
+					<p>
+						{ __(
+							'New to Google Ads? Get $500 in ad credit when you spend $500 within your first 60 days* You can edit or cancel your campaign at any time.',
+							'google-listings-and-ads'
+						) }
+					</p>
+					<cite>
+						{ createInterpolateElement(
+							__(
+								'*Full terms and conditions <link>here</link>.',
+								'google-listings-and-ads'
+							),
+							{
+								link: (
+									<ContentLink
+										href="https://www.google.com/ads/coupons/terms/"
+										context="terms-of-ads-coupons"
+									/>
+								),
+							}
+						) }
+					</cite>
+				</GuidePageContent>
+			),
+			footer: (
+				<>
+					<div className="gla-submission-success-guide__space_holder" />
 
-	if ( glaData.adsSetupComplete ) {
-		// Remove the Google Ads credits screens.
-		delete PAGES?.[ GOOGLE_ADS_CREDITS_SCREEN ];
-	} else if ( ! campaigns?.length ) {
-		// There are no campaigns, do not show the enhanced conversion tracking screen.
-		delete PAGES?.[ ENHANCED_CONVERSION_TRACKING_SCREEN ];
-	}
+					<AddPaidCampaignButton
+						isPrimary
+						isSecondary={ false }
+						isSmall={ false }
+						eventName={ EVENT_NAME }
+						eventProps={ {
+							context: GUIDE_NAMES.SUBMISSION_SUCCESS,
+							action: 'create-paid-campaign',
+						} }
+					>
+						{ __(
+							'Create paid campaign',
+							'google-listings-and-ads'
+						) }
+					</AddPaidCampaignButton>
 
-	if ( ! loaded ) {
-		return <SpinnerCard />;
+					<AppButton
+						isSecondary
+						data-action="maybe-later"
+						onClick={ handleGuideFinish }
+					>
+						{ __( 'Maybe later', 'google-listings-and-ads' ) }
+					</AppButton>
+				</>
+			),
+		};
 	}
 
 	const pages = Object.keys( PAGES ).map( ( screen ) => PAGES[ screen ] );
diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index 7b67b8df7a..3ab4be7d42 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -324,7 +324,7 @@ private function get_merchant_link( int $merchant_id ): MerchantCenterLink {
 
 		throw new Exception( __( 'Merchant link is not available to accept', 'google-listings-and-ads' ) );
 	}
-	
+
 	/**
 	 * Check if the user has accepted the customer data terms for enhanced conversion tracking.
 	 * Returns false for any account that fails.
@@ -354,4 +354,18 @@ public function get_accepted_customer_data_terms(): bool {
 
 		return false;
 	}
+
+	/**
+	 * @TODO: wire properly
+	 * Updates the enhanced ads conversion status.
+	 * Returns false for any failures.
+	 *
+	 * @param string $status The status value
+	 * 
+	 * @return string
+	 */
+	public function update_enhanced_conversion_status(string $status): string {
+		// @TODO: Wire properly
+		return $status;
+	}
 }
diff --git a/src/API/Site/Controllers/Ads/AccountController.php b/src/API/Site/Controllers/Ads/AccountController.php
index cc3c1735d3..4b8e2197f0 100644
--- a/src/API/Site/Controllers/Ads/AccountController.php
+++ b/src/API/Site/Controllers/Ads/AccountController.php
@@ -97,6 +97,17 @@ public function register_routes(): void {
 				],
 			]
 		);
+
+		$this->register_route(
+			'ads/update-enhanced-conversion-status',
+			[
+				[
+					'methods'             => TransportMethods::EDITABLE,
+					'callback'            => $this->update_enhanced_ads_conversion_callback(),
+					'permission_callback' => $this->get_permission_callback(),
+				],
+			]
+		);
 	}
 
 	/**
@@ -174,7 +185,7 @@ protected function get_billing_status_callback(): callable {
 	}
 
 	/**
-	 * Get the callback function for retrieving the billing setup status.
+	 * Get the callback function for retrieving the accepted customer data terms status.
 	 *
 	 * @return callable
 	 */
@@ -184,6 +195,23 @@ protected function get_accepted_customer_data_terms_callback(): callable {
 		};
 	}
 
+	/**
+	 * Get the callback function for updating the ads enhanced conversion status.
+	 *
+	 * @return callable
+	 */
+	protected function update_enhanced_ads_conversion_callback(): callable {
+		return function ( Request $request ) {
+			try {
+				$status = $request['status'];
+
+				return $this->account->update_enhanced_conversion_status( $status );
+			} catch ( Exception $e ) {
+				return $this->response_from_exception( $e );
+			}
+		};
+	}
+
 	/**
 	 * Get the item schema for the controller.
 	 *
diff --git a/src/Ads/AccountService.php b/src/Ads/AccountService.php
index 803d54932a..a3372036de 100644
--- a/src/Ads/AccountService.php
+++ b/src/Ads/AccountService.php
@@ -290,4 +290,19 @@ public function get_accepted_customer_data_terms(): array {
 			'status' => $status,
 		];
 	}
+
+	/**
+	 * Updates the enhanced ads conversion status.
+	 * 
+	 * @param string $status Status which should be updated to. Possible values are: pending, enabled and disabled.
+	 *
+	 * @return array
+	 */
+	public function update_enhanced_conversion_status(string $status): array {
+		$updated_status = $this->container->get( Ads::class )->update_enhanced_conversion_status( $status );
+
+		return [
+			'status' => $updated_status,
+		];
+	}
 }

From 748a9d62f15996ab86d1a30b7809d48b14c4bef1 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Fri, 9 Feb 2024 17:34:40 +0400
Subject: [PATCH 07/95] Fix failing tests.

---
 js/src/data/reducer.js | 1 -
 src/API/Google/Ads.php | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/src/data/reducer.js b/js/src/data/reducer.js
index 1101f73ee4..ab8e57bb2c 100644
--- a/js/src/data/reducer.js
+++ b/js/src/data/reducer.js
@@ -7,7 +7,6 @@ import { setWith, clone } from 'lodash';
  * Internal dependencies
  */
 import TYPES from './action-types';
-import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 
 const DEFAULT_STATE = {
 	general: {
diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index 3ab4be7d42..20fe4849dc 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -361,10 +361,10 @@ public function get_accepted_customer_data_terms(): bool {
 	 * Returns false for any failures.
 	 *
 	 * @param string $status The status value
-	 * 
+	 *
 	 * @return string
 	 */
-	public function update_enhanced_conversion_status(string $status): string {
+	public function update_enhanced_conversion_status( string $status ): string {
 		// @TODO: Wire properly
 		return $status;
 	}

From 864d74b24fde4e6deeef4d44a281f881a48b821f Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Fri, 9 Feb 2024 17:37:06 +0400
Subject: [PATCH 08/95] Hopefully last of PHP fixes.

---
 src/Ads/AccountService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Ads/AccountService.php b/src/Ads/AccountService.php
index a3372036de..977fe180ad 100644
--- a/src/Ads/AccountService.php
+++ b/src/Ads/AccountService.php
@@ -293,12 +293,12 @@ public function get_accepted_customer_data_terms(): array {
 
 	/**
 	 * Updates the enhanced ads conversion status.
-	 * 
+	 *
 	 * @param string $status Status which should be updated to. Possible values are: pending, enabled and disabled.
 	 *
 	 * @return array
 	 */
-	public function update_enhanced_conversion_status(string $status): array {
+	public function update_enhanced_conversion_status( string $status ): array {
 		$updated_status = $this->container->get( Ads::class )->update_enhanced_conversion_status( $status );
 
 		return [

From 43595c349f14ee62dd0dc9e936ff447d65fe6e4f Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Fri, 9 Feb 2024 20:51:18 +0400
Subject: [PATCH 09/95] Add SettingsPanel.

---
 .../PendingStatus.js                          |  33 +++++
 .../index.js                                  | 135 ++++++++++++++++++
 js/src/data/action-types.js                   |   1 +
 js/src/data/actions.js                        |  21 ++-
 js/src/data/reducer.js                        |  18 ++-
 js/src/data/resolvers.js                      |  22 +++
 js/src/data/selectors.js                      |   4 +-
 js/src/hooks/useAllowEnhancedConversions.js   |   8 +-
 .../EnhancedConversionFooter.js               |  15 +-
 .../submission-success-guide/index.js         |   7 +-
 js/src/settings/index.js                      |   2 +
 src/API/Google/Ads.php                        |  16 ++-
 .../Controllers/Ads/AccountController.php     |  22 +++
 src/Ads/AccountService.php                    |  13 ++
 14 files changed, 294 insertions(+), 23 deletions(-)
 create mode 100644 js/src/components/enhanced-conversion-tracking-settings/PendingStatus.js
 create mode 100644 js/src/components/enhanced-conversion-tracking-settings/index.js

diff --git a/js/src/components/enhanced-conversion-tracking-settings/PendingStatus.js b/js/src/components/enhanced-conversion-tracking-settings/PendingStatus.js
new file mode 100644
index 0000000000..b0c0b84bc7
--- /dev/null
+++ b/js/src/components/enhanced-conversion-tracking-settings/PendingStatus.js
@@ -0,0 +1,33 @@
+/**
+ * External dependencies
+ */
+import { useEffect } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { useAppDispatch } from '.~/data';
+import { API_NAMESPACE } from '.~/data/constants';
+import usePolling from '.~/hooks/usePolling';
+
+const PendingStatus = () => {
+	const { receiveAcceptedTerms } = useAppDispatch();
+
+	const { data, start } = usePolling( {
+		path: `${ API_NAMESPACE }/ads/accepted-customer-data-terms`,
+	} );
+
+	useEffect( () => {
+		start();
+	}, [ start ] );
+
+	if ( ! data ) {
+		return null;
+	}
+
+	if ( data.status !== null ) {
+		receiveAcceptedTerms( data );
+	}
+};
+
+export default PendingStatus;
diff --git a/js/src/components/enhanced-conversion-tracking-settings/index.js b/js/src/components/enhanced-conversion-tracking-settings/index.js
new file mode 100644
index 0000000000..86df393270
--- /dev/null
+++ b/js/src/components/enhanced-conversion-tracking-settings/index.js
@@ -0,0 +1,135 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useCallback } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import {
+	ENHANCED_ADS_CONVERSION_STATUS,
+	GOOGLE_ADS_ACCOUNT_STATUS,
+} from '.~/constants';
+import { useAppDispatch } from '.~/data';
+import AppSpinner from '.~/components/app-spinner';
+import SpinnerCard from '.~/components/spinner-card';
+import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
+import AppButton from '../app-button';
+import Section from '.~/wcdl/section';
+import VerticalGapLayout from '.~/components/vertical-gap-layout';
+import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
+import PendingStatus from './PendingStatus';
+
+const DESCRIPTION = (
+	<p>
+		{ __(
+			'Improve your conversion tracking accuracy and unlock more powerful bidding.This feature works alongside your existing conversion tags, sending secure, privacy-friendly conversion data from your website to Google',
+			'google-listings-and-ads'
+		) }
+	</p>
+);
+
+const TITLE = __( 'Enhanced Conversion Tracking', 'google-listings-and-ads' );
+
+/**
+ * Renders the settings panel for enhanced conversion tracking
+ */
+const EnhancedConversionTrackingSettings = () => {
+	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
+	const { googleAdsAccount, hasFinishedResolution } = useGoogleAdsAccount();
+	const { acceptedCustomerDataTerms } = useAcceptedCustomerDataTerms();
+	const { allowEnhancedConversions } = useAllowEnhancedConversions();
+
+	const TOS_URL = 'https://ads.google.com/aw/conversions/customersettings';
+
+	const handleTOS = useCallback( () => {
+		window.open( TOS_URL, '_blank' );
+
+		updateEnhancedAdsConversionStatus(
+			ENHANCED_ADS_CONVERSION_STATUS.PENDING
+		);
+	}, [ updateEnhancedAdsConversionStatus ] );
+
+	const handleDisable = useCallback( () => {
+		updateEnhancedAdsConversionStatus(
+			ENHANCED_ADS_CONVERSION_STATUS.DISABLED
+		);
+	}, [ updateEnhancedAdsConversionStatus ] );
+
+	const handleEnable = useCallback( () => {
+		updateEnhancedAdsConversionStatus(
+			ENHANCED_ADS_CONVERSION_STATUS.ENABLED
+		);
+	}, [ updateEnhancedAdsConversionStatus ] );
+
+	if (
+		( ! googleAdsAccount ||
+			googleAdsAccount?.status !==
+				GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED ) &&
+		hasFinishedResolution
+	) {
+		return null;
+	}
+
+	const getCTA = () => {
+		if ( ! acceptedCustomerDataTerms ) {
+			return (
+				<AppButton isPrimary onClick={ handleTOS }>
+					{ __(
+						'Accept Terms & Conditions',
+						'google-listings-and-ads'
+					) }
+				</AppButton>
+			);
+		}
+
+		if (
+			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.ENABLED
+		) {
+			return (
+				<AppButton isPrimary isDestructive onClick={ handleDisable }>
+					{ __( 'Disable', 'google-listings-and-ads' ) }
+				</AppButton>
+			);
+		}
+
+		if (
+			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.DISABLED
+		) {
+			return (
+				<AppButton isPrimary onClick={ handleEnable }>
+					{ __( 'Enable', 'google-listings-and-ads' ) }
+				</AppButton>
+			);
+		}
+
+		if (
+			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
+		) {
+			return (
+				<AppButton isSecondary disabled>
+					<AppSpinner />
+					<PendingStatus />
+				</AppButton>
+			);
+		}
+	};
+
+	return (
+		<Section title={ TITLE } description={ <div>{ DESCRIPTION }</div> }>
+			{ ! hasFinishedResolution && <SpinnerCard /> }
+
+			{ hasFinishedResolution && (
+				<VerticalGapLayout size="large">
+					<Section.Card>
+						<Section.Card.Body>{ getCTA() }</Section.Card.Body>
+					</Section.Card>
+				</VerticalGapLayout>
+			) }
+		</Section>
+	);
+};
+
+export default EnhancedConversionTrackingSettings;
diff --git a/js/src/data/action-types.js b/js/src/data/action-types.js
index 9eaf1d67ea..e26f065407 100644
--- a/js/src/data/action-types.js
+++ b/js/src/data/action-types.js
@@ -53,6 +53,7 @@ const TYPES = {
 		'RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS',
 	UPDATE_ENHANCED_ADS_CONVERSION_STATUS:
 		'UPDATE_ENHANCED_ADS_CONVERSION_STATUS',
+	RECEIVE_ALLOW_ENHANCED_CONVERSIONS: 'RECEIVE_ALLOW_ENHANCED_CONVERSIONS',
 };
 
 export default TYPES;
diff --git a/js/src/data/actions.js b/js/src/data/actions.js
index cbf441f069..8460263cb9 100644
--- a/js/src/data/actions.js
+++ b/js/src/data/actions.js
@@ -578,13 +578,6 @@ export function receiveGoogleMCContactInformation( data ) {
 	};
 }
 
-export function receiveAcceptedTerms( data ) {
-	return {
-		type: TYPES.RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS,
-		data,
-	};
-}
-
 /**
  * Update the contact information to user's account of Google Merchant Center.
  * It will update the store address of WooCommerce Settings to Google Merchant Center if they are different.
@@ -1255,6 +1248,13 @@ export function* upsertTour( tour, upsertingClientStoreFirst = false ) {
 	}
 }
 
+export function receiveAcceptedTerms( data ) {
+	return {
+		type: TYPES.RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS,
+		data,
+	};
+}
+
 /**
  * Updates the enhanced ads conversion status.
  *
@@ -1285,3 +1285,10 @@ export function* updateEnhancedAdsConversionStatus( status ) {
 		);
 	}
 }
+
+export function receiveAllowEnhancedConversions( data ) {
+	return {
+		type: TYPES.RECEIVE_ALLOW_ENHANCED_CONVERSIONS,
+		data,
+	};
+}
diff --git a/js/src/data/reducer.js b/js/src/data/reducer.js
index ab8e57bb2c..f5124e190e 100644
--- a/js/src/data/reducer.js
+++ b/js/src/data/reducer.js
@@ -509,8 +509,10 @@ const reducer = ( state = DEFAULT_STATE, action ) => {
 			);
 		}
 
-		case TYPES.UPDATE_ENHANCED_ADS_CONVERSION: {
-			const { status } = action;
+		case TYPES.UPDATE_ENHANCED_ADS_CONVERSION_STATUS: {
+			const {
+				response: { status },
+			} = action;
 
 			if ( status === null || status === undefined ) {
 				return state;
@@ -523,6 +525,18 @@ const reducer = ( state = DEFAULT_STATE, action ) => {
 			);
 		}
 
+		case TYPES.RECEIVE_ALLOW_ENHANCED_CONVERSIONS: {
+			const {
+				data: { status },
+			} = action;
+
+			return setIn(
+				state,
+				'ads.conversion_tracking_setting.allow_enhanced_conversions',
+				status
+			);
+		}
+
 		// Page will be reloaded after all accounts have been disconnected, so no need to mutate state.
 		case TYPES.DISCONNECT_ACCOUNTS_ALL:
 		default:
diff --git a/js/src/data/resolvers.js b/js/src/data/resolvers.js
index 09ead00f95..e9cad9572d 100644
--- a/js/src/data/resolvers.js
+++ b/js/src/data/resolvers.js
@@ -46,6 +46,7 @@ import {
 	receiveStoreCategories,
 	receiveTour,
 	receiveAcceptedTerms,
+	receiveAllowEnhancedConversions,
 } from './actions';
 
 export function* getShippingRates() {
@@ -541,3 +542,24 @@ export function* getAcceptedCustomerDataTerms() {
 		);
 	}
 }
+
+/**
+ * Resolver for getting the enhanced conversion status.
+ */
+export function* getAllowEnhancedConversions() {
+	try {
+		const response = yield apiFetch( {
+			path: `${ API_NAMESPACE }/ads/allow-enhance-conversions`,
+		} );
+
+		yield receiveAllowEnhancedConversions( response );
+	} catch ( error ) {
+		handleApiError(
+			error,
+			__(
+				'There was an error getting the enhance conversions status.',
+				'google-listings-and-ads'
+			)
+		);
+	}
+}
diff --git a/js/src/data/selectors.js b/js/src/data/selectors.js
index 17034d48d0..72c2febf40 100644
--- a/js/src/data/selectors.js
+++ b/js/src/data/selectors.js
@@ -417,6 +417,6 @@ export const getAcceptedCustomerDataTerms = ( state ) => {
  * @param {Object} state The state
  * @return {boolean} TRUE if the user allowed enhanced conversion tracking.
  */
-export const getAllowEnhanceConversions = ( state ) => {
-	return state.ads.allow_enhanced_conversions;
+export const getAllowEnhancedConversions = ( state ) => {
+	return state.ads.conversion_tracking_setting.allow_enhanced_conversions;
 };
diff --git a/js/src/hooks/useAllowEnhancedConversions.js b/js/src/hooks/useAllowEnhancedConversions.js
index 6363f6ee9a..2d9982eb8d 100644
--- a/js/src/hooks/useAllowEnhancedConversions.js
+++ b/js/src/hooks/useAllowEnhancedConversions.js
@@ -10,13 +10,13 @@ import { STORE_KEY } from '.~/data/constants';
 
 const useAllowEnhancedConversions = () => {
 	return useSelect( ( select ) => {
-		const allowEnhanceConversions =
-			select( STORE_KEY ).getAllowEnhanceConversions();
+		const allowEnhancedConversions =
+			select( STORE_KEY ).getAllowEnhancedConversions();
 		const isResolving = select( STORE_KEY ).isResolving(
-			'getAllowEnhanceConversions'
+			'getAllowEnhancedConversions'
 		);
 
-		return { allowEnhanceConversions, isResolving };
+		return { allowEnhancedConversions, isResolving };
 	}, [] );
 };
 
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
index 9eb99a6f46..a3e1d47093 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
@@ -9,10 +9,12 @@ import { useCallback } from '@wordpress/element';
  */
 import { useAppDispatch } from '.~/data';
 import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
+import useDispatchCoreNotices from '.~/hooks/useDispatchCoreNotices';
 import AppButton from '.~/components/app-button';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 
 const EnhancedConversionFooter = ( { handleGuideFinish } ) => {
+	const { createNotice } = useDispatchCoreNotices();
 	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
 	const {
 		acceptedCustomerDataTerms: hasAcceptedTerms,
@@ -28,6 +30,12 @@ const EnhancedConversionFooter = ( { handleGuideFinish } ) => {
 				ENHANCED_ADS_CONVERSION_STATUS.ENABLED
 			);
 
+			createNotice(
+				'info',
+				__( 'Status succesfully set', 'google-listings-and-ads' )
+			);
+
+			handleGuideFinish?.();
 			return;
 		}
 
@@ -35,7 +43,12 @@ const EnhancedConversionFooter = ( { handleGuideFinish } ) => {
 		updateEnhancedAdsConversionStatus(
 			ENHANCED_ADS_CONVERSION_STATUS.PENDING
 		);
-	}, [ hasAcceptedTerms, updateEnhancedAdsConversionStatus ] );
+	}, [
+		hasAcceptedTerms,
+		updateEnhancedAdsConversionStatus,
+		createNotice,
+		handleGuideFinish,
+	] );
 
 	return (
 		<>
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index f2a8acafc5..df3984df56 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -153,13 +153,10 @@ const SubmissionSuccessGuide = () => {
 	// @todo: Review whether we need that function since we have moved the buttons to be per page now.
 	const renderFinish = useCallback( () => null, [] );
 
-	const showEnhancedConversionTrackingScreen =
-		glaData.adsSetupComplete &&
-		! PAGES[ ENHANCED_CONVERSION_TRACKING_SCREEN ];
+	const showEnhancedConversionTrackingScreen = glaData.adsSetupComplete;
 
 	// @todo: Review logic to display credits screen. How do we get the paid campaigns?
-	const showGoogleAdsCreditsScreen =
-		! campaigns?.length && ! PAGES[ ENHANCED_CONVERSION_TRACKING_SCREEN ];
+	const showGoogleAdsCreditsScreen = ! campaigns?.length;
 
 	if ( showEnhancedConversionTrackingScreen ) {
 		// Add conversion screen if ads setup is complete
diff --git a/js/src/settings/index.js b/js/src/settings/index.js
index 4189ca0059..96613b04da 100644
--- a/js/src/settings/index.js
+++ b/js/src/settings/index.js
@@ -12,6 +12,7 @@ import useLegacyMenuEffect from '.~/hooks/useLegacyMenuEffect';
 import useGoogleAccount from '.~/hooks/useGoogleAccount';
 import { subpaths, getReconnectAccountUrl } from '.~/utils/urls';
 import { ContactInformationPreview } from '.~/components/contact-information';
+import EnhancedConversionTrackingSettings from '.~/components/enhanced-conversion-tracking-settings';
 import LinkedAccounts from './linked-accounts';
 import ReconnectWPComAccount from './reconnect-wpcom-account';
 import ReconnectGoogleAccount from './reconnect-google-account';
@@ -62,6 +63,7 @@ const Settings = () => {
 			<NavigationClassic />
 			<ContactInformationPreview />
 			<LinkedAccounts />
+			<EnhancedConversionTrackingSettings />
 		</div>
 	);
 };
diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index 20fe4849dc..54a4de50ef 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -331,7 +331,7 @@ private function get_merchant_link( int $merchant_id ): MerchantCenterLink {
 	 *
 	 * @return boolean
 	 */
-	public function get_accepted_customer_data_terms(): bool {
+	public function get_accepted_customer_data_terms(): bool | null {
 		$ads_id = $this->options->get_ads_id();
 
 		try {
@@ -352,7 +352,7 @@ public function get_accepted_customer_data_terms(): bool {
 			do_action( 'woocommerce_gla_ads_client_exception', $e, __METHOD__ );
 		}
 
-		return false;
+		return null;
 	}
 
 	/**
@@ -368,4 +368,16 @@ public function update_enhanced_conversion_status( string $status ): string {
 		// @TODO: Wire properly
 		return $status;
 	}
+
+	/**
+	 * @TODO: wire properly
+	 * Updates the enhanced ads conversion status.
+	 * Returns false for any failures.
+	 *
+	 * @return string
+	 */
+	public function get_enhanced_conversion_status(): string {
+		// @TODO: Wire properly
+		return 'enabled';
+	}
 }
diff --git a/src/API/Site/Controllers/Ads/AccountController.php b/src/API/Site/Controllers/Ads/AccountController.php
index 4b8e2197f0..073b25ae0c 100644
--- a/src/API/Site/Controllers/Ads/AccountController.php
+++ b/src/API/Site/Controllers/Ads/AccountController.php
@@ -108,6 +108,17 @@ public function register_routes(): void {
 				],
 			]
 		);
+
+		$this->register_route(
+			'ads/allow-enhance-conversions',
+			[
+				[
+					'methods'             => TransportMethods::READABLE,
+					'callback'            => $this->get_enhanced_conversion_status_callback(),
+					'permission_callback' => $this->get_permission_callback(),
+				],
+			]
+		);
 	}
 
 	/**
@@ -212,6 +223,17 @@ protected function update_enhanced_ads_conversion_callback(): callable {
 		};
 	}
 
+	/**
+	 * Get the callback function for retrieving the enhanced conversion status.
+	 *
+	 * @return callable
+	 */
+	protected function get_enhanced_conversion_status_callback(): callable {
+		return function () {
+			return $this->account->get_enhanced_conversion_status();
+		};
+	}
+
 	/**
 	 * Get the item schema for the controller.
 	 *
diff --git a/src/Ads/AccountService.php b/src/Ads/AccountService.php
index 977fe180ad..d809868635 100644
--- a/src/Ads/AccountService.php
+++ b/src/Ads/AccountService.php
@@ -305,4 +305,17 @@ public function update_enhanced_conversion_status( string $status ): array {
 			'status' => $updated_status,
 		];
 	}
+
+	/**
+	 * Gets the enhanced conversion status.
+	 *
+	 * @return array
+	 */
+	public function get_enhanced_conversion_status(): array {
+		$status = $this->container->get( Ads::class )->get_enhanced_conversion_status();
+
+		return [
+			'status' => $status,
+		];
+	}
 }

From 97f0449c52531aa2548ccb3a98cb90d710dabeab Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Sat, 10 Feb 2024 01:06:49 +0400
Subject: [PATCH 10/95] Common CTA component for Enhanced Conversion.

---
 .../{ => cta}/PendingStatus.js                |  15 +--
 .../cta/index.js                              | 113 ++++++++++++++++++
 .../index.js                                  |  86 +------------
 .../EnhancedConversionFooter.js               |  65 +++-------
 src/API/Google/Ads.php                        |   4 +-
 5 files changed, 144 insertions(+), 139 deletions(-)
 rename js/src/components/enhanced-conversion-tracking-settings/{ => cta}/PendingStatus.js (60%)
 create mode 100644 js/src/components/enhanced-conversion-tracking-settings/cta/index.js

diff --git a/js/src/components/enhanced-conversion-tracking-settings/PendingStatus.js b/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js
similarity index 60%
rename from js/src/components/enhanced-conversion-tracking-settings/PendingStatus.js
rename to js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js
index b0c0b84bc7..7eaab8f90c 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/PendingStatus.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js
@@ -8,10 +8,11 @@ import { useEffect } from '@wordpress/element';
  */
 import { useAppDispatch } from '.~/data';
 import { API_NAMESPACE } from '.~/data/constants';
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import usePolling from '.~/hooks/usePolling';
 
 const PendingStatus = () => {
-	const { receiveAcceptedTerms } = useAppDispatch();
+	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
 
 	const { data, start } = usePolling( {
 		path: `${ API_NAMESPACE }/ads/accepted-customer-data-terms`,
@@ -21,12 +22,12 @@ const PendingStatus = () => {
 		start();
 	}, [ start ] );
 
-	if ( ! data ) {
-		return null;
-	}
-
-	if ( data.status !== null ) {
-		receiveAcceptedTerms( data );
+	if ( data && data.status !== null ) {
+		updateEnhancedAdsConversionStatus(
+			data.status
+				? ENHANCED_ADS_CONVERSION_STATUS.DISABLED
+				: ENHANCED_ADS_CONVERSION_STATUS.ENABLED
+		);
 	}
 };
 
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
new file mode 100644
index 0000000000..f18f81d163
--- /dev/null
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
@@ -0,0 +1,113 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useCallback, useEffect } from '@wordpress/element';
+import { Spinner } from '@woocommerce/components';
+
+/**
+ * Internal dependencies
+ */
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
+import { useAppDispatch } from '.~/data';
+import AppButton from '.~/components/app-button';
+import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
+import PendingStatus from './PendingStatus';
+
+const CTA = ( {
+	acceptTermsLabel = __(
+		'Accept Terms & Conditions',
+		'google-listings-and-ads'
+	),
+	disableLabel = __( 'Disable', 'google-listings-and-ads' ),
+	enableLabel = __( 'Enable', 'google-listings-and-ads' ),
+	onAcceptTermsClick,
+} ) => {
+	const { updateEnhancedAdsConversionStatus, invalidateResolution } =
+		useAppDispatch();
+	const { acceptedCustomerDataTerms, hasFinishedResolution } =
+		useAcceptedCustomerDataTerms();
+	const { allowEnhancedConversions } = useAllowEnhancedConversions();
+
+	const TOS_URL = 'https://ads.google.com/aw/conversions/customersettings';
+
+	useEffect( () => {
+		if (
+			allowEnhancedConversions !== ENHANCED_ADS_CONVERSION_STATUS.PENDING
+		) {
+			invalidateResolution( 'getAcceptedCustomerDataTerms', [] );
+		}
+	}, [ allowEnhancedConversions, invalidateResolution ] );
+
+	const handleTOS = useCallback( () => {
+		window.open( TOS_URL, '_blank' );
+
+		updateEnhancedAdsConversionStatus(
+			ENHANCED_ADS_CONVERSION_STATUS.PENDING
+		);
+
+		onAcceptTermsClick?.();
+	}, [ updateEnhancedAdsConversionStatus, onAcceptTermsClick ] );
+
+	const handleDisable = useCallback( () => {
+		if ( ! acceptedCustomerDataTerms ) {
+			return;
+		}
+
+		updateEnhancedAdsConversionStatus(
+			ENHANCED_ADS_CONVERSION_STATUS.DISABLED
+		);
+	}, [ updateEnhancedAdsConversionStatus, acceptedCustomerDataTerms ] );
+
+	const handleEnable = useCallback( () => {
+		if ( ! acceptedCustomerDataTerms ) {
+			return;
+		}
+
+		updateEnhancedAdsConversionStatus(
+			ENHANCED_ADS_CONVERSION_STATUS.ENABLED
+		);
+	}, [ updateEnhancedAdsConversionStatus, acceptedCustomerDataTerms ] );
+
+	if ( ! hasFinishedResolution ) {
+		return <Spinner />;
+	}
+
+	if ( ! acceptedCustomerDataTerms ) {
+		return (
+			<AppButton isPrimary onClick={ handleTOS }>
+				{ acceptTermsLabel }
+			</AppButton>
+		);
+	}
+
+	if ( allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.ENABLED ) {
+		return (
+			<AppButton isPrimary isDestructive onClick={ handleDisable }>
+				{ disableLabel }
+			</AppButton>
+		);
+	}
+
+	if (
+		allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.DISABLED
+	) {
+		return (
+			<AppButton isPrimary onClick={ handleEnable }>
+				{ enableLabel }
+			</AppButton>
+		);
+	}
+
+	if ( allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING ) {
+		return (
+			<>
+				<AppButton isSecondary disabled loading></AppButton>
+				<PendingStatus />
+			</>
+		);
+	}
+};
+
+export default CTA;
diff --git a/js/src/components/enhanced-conversion-tracking-settings/index.js b/js/src/components/enhanced-conversion-tracking-settings/index.js
index 86df393270..9be9c7fe6d 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/index.js
@@ -2,25 +2,16 @@
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useCallback } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import {
-	ENHANCED_ADS_CONVERSION_STATUS,
-	GOOGLE_ADS_ACCOUNT_STATUS,
-} from '.~/constants';
-import { useAppDispatch } from '.~/data';
-import AppSpinner from '.~/components/app-spinner';
+import { GOOGLE_ADS_ACCOUNT_STATUS } from '.~/constants';
 import SpinnerCard from '.~/components/spinner-card';
 import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
-import AppButton from '../app-button';
 import Section from '.~/wcdl/section';
 import VerticalGapLayout from '.~/components/vertical-gap-layout';
-import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
-import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
-import PendingStatus from './PendingStatus';
+import CTA from './cta';
 
 const DESCRIPTION = (
 	<p>
@@ -37,32 +28,7 @@ const TITLE = __( 'Enhanced Conversion Tracking', 'google-listings-and-ads' );
  * Renders the settings panel for enhanced conversion tracking
  */
 const EnhancedConversionTrackingSettings = () => {
-	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
 	const { googleAdsAccount, hasFinishedResolution } = useGoogleAdsAccount();
-	const { acceptedCustomerDataTerms } = useAcceptedCustomerDataTerms();
-	const { allowEnhancedConversions } = useAllowEnhancedConversions();
-
-	const TOS_URL = 'https://ads.google.com/aw/conversions/customersettings';
-
-	const handleTOS = useCallback( () => {
-		window.open( TOS_URL, '_blank' );
-
-		updateEnhancedAdsConversionStatus(
-			ENHANCED_ADS_CONVERSION_STATUS.PENDING
-		);
-	}, [ updateEnhancedAdsConversionStatus ] );
-
-	const handleDisable = useCallback( () => {
-		updateEnhancedAdsConversionStatus(
-			ENHANCED_ADS_CONVERSION_STATUS.DISABLED
-		);
-	}, [ updateEnhancedAdsConversionStatus ] );
-
-	const handleEnable = useCallback( () => {
-		updateEnhancedAdsConversionStatus(
-			ENHANCED_ADS_CONVERSION_STATUS.ENABLED
-		);
-	}, [ updateEnhancedAdsConversionStatus ] );
 
 	if (
 		( ! googleAdsAccount ||
@@ -73,50 +39,6 @@ const EnhancedConversionTrackingSettings = () => {
 		return null;
 	}
 
-	const getCTA = () => {
-		if ( ! acceptedCustomerDataTerms ) {
-			return (
-				<AppButton isPrimary onClick={ handleTOS }>
-					{ __(
-						'Accept Terms & Conditions',
-						'google-listings-and-ads'
-					) }
-				</AppButton>
-			);
-		}
-
-		if (
-			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.ENABLED
-		) {
-			return (
-				<AppButton isPrimary isDestructive onClick={ handleDisable }>
-					{ __( 'Disable', 'google-listings-and-ads' ) }
-				</AppButton>
-			);
-		}
-
-		if (
-			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.DISABLED
-		) {
-			return (
-				<AppButton isPrimary onClick={ handleEnable }>
-					{ __( 'Enable', 'google-listings-and-ads' ) }
-				</AppButton>
-			);
-		}
-
-		if (
-			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
-		) {
-			return (
-				<AppButton isSecondary disabled>
-					<AppSpinner />
-					<PendingStatus />
-				</AppButton>
-			);
-		}
-	};
-
 	return (
 		<Section title={ TITLE } description={ <div>{ DESCRIPTION }</div> }>
 			{ ! hasFinishedResolution && <SpinnerCard /> }
@@ -124,7 +46,9 @@ const EnhancedConversionTrackingSettings = () => {
 			{ hasFinishedResolution && (
 				<VerticalGapLayout size="large">
 					<Section.Card>
-						<Section.Card.Body>{ getCTA() }</Section.Card.Body>
+						<Section.Card.Body>
+							<CTA />
+						</Section.Card.Body>
 					</Section.Card>
 				</VerticalGapLayout>
 			) }
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
index a3e1d47093..d2526391b5 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
@@ -7,67 +7,34 @@ import { useCallback } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { useAppDispatch } from '.~/data';
-import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import useDispatchCoreNotices from '.~/hooks/useDispatchCoreNotices';
 import AppButton from '.~/components/app-button';
-import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+import CTA from '.~/components/enhanced-conversion-tracking-settings/cta';
 
 const EnhancedConversionFooter = ( { handleGuideFinish } ) => {
 	const { createNotice } = useDispatchCoreNotices();
-	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
-	const {
-		acceptedCustomerDataTerms: hasAcceptedTerms,
-		hasFinishedResolution,
-	} = useAcceptedCustomerDataTerms();
 
-	// @todo: Review URL
-	const TOS_URL = 'https://ads.google.com/aw/conversions/customersettings';
-
-	const handleOnClick = useCallback( () => {
-		if ( hasAcceptedTerms ) {
-			updateEnhancedAdsConversionStatus(
-				ENHANCED_ADS_CONVERSION_STATUS.ENABLED
-			);
-
-			createNotice(
-				'info',
-				__( 'Status succesfully set', 'google-listings-and-ads' )
-			);
-
-			handleGuideFinish?.();
-			return;
-		}
-
-		window.open( TOS_URL, '_blank' );
-		updateEnhancedAdsConversionStatus(
-			ENHANCED_ADS_CONVERSION_STATUS.PENDING
+	const handleOnAcceptTermsClick = useCallback( () => {
+		createNotice(
+			'info',
+			__( 'Status succesfully set', 'google-listings-and-ads' )
 		);
-	}, [
-		hasAcceptedTerms,
-		updateEnhancedAdsConversionStatus,
-		createNotice,
-		handleGuideFinish,
-	] );
+
+		handleGuideFinish?.();
+	}, [ createNotice, handleGuideFinish ] );
 
 	return (
 		<>
 			<div className="gla-submission-success-guide__space_holder" />
 
-			{ ! hasFinishedResolution && <AppButton isPrimary loading /> }
-
-			{ hasFinishedResolution && (
-				<AppButton onClick={ handleOnClick } isPrimary>
-					{ ! hasAcceptedTerms &&
-						__(
-							'Sign terms of service on Google Ads',
-							'google-listings-and-ads'
-						) }
-
-					{ hasAcceptedTerms &&
-						__( 'Confirm', 'google-listings-and-ads' ) }
-				</AppButton>
-			) }
+			<CTA
+				onAcceptTermsClick={ handleOnAcceptTermsClick }
+				acceptTermsLabel={ __(
+					'Sign terms of service on Google Ads',
+					'google-listings-and-ads'
+				) }
+				enableLabel={ __( 'Confirm', 'google-listings-and-ads' ) }
+			/>
 
 			<AppButton
 				isSecondary
diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index 54a4de50ef..bb86d666bd 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -331,7 +331,7 @@ private function get_merchant_link( int $merchant_id ): MerchantCenterLink {
 	 *
 	 * @return boolean
 	 */
-	public function get_accepted_customer_data_terms(): bool | null {
+	public function get_accepted_customer_data_terms(): ?bool {
 		$ads_id = $this->options->get_ads_id();
 
 		try {
@@ -378,6 +378,6 @@ public function update_enhanced_conversion_status( string $status ): string {
 	 */
 	public function get_enhanced_conversion_status(): string {
 		// @TODO: Wire properly
-		return 'enabled';
+		return 'pending';
 	}
 }

From bb6e289074e5396dd334cad0540377e4943d0f8d Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Mon, 12 Feb 2024 16:25:10 +0400
Subject: [PATCH 11/95] Fix polling.

---
 .../cta/PendingStatus.js                      | 14 +++++++++----
 .../cta/index.js                              | 20 ++++++++++++++++---
 .../EnhancedConversionFooter.js               |  5 +++--
 src/API/Google/Ads.php                        |  4 ++--
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js b/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js
index 7eaab8f90c..71b74f53f0 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js
@@ -12,11 +12,15 @@ import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import usePolling from '.~/hooks/usePolling';
 
 const PendingStatus = () => {
-	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
+	const { updateEnhancedAdsConversionStatus, invalidateResolution } =
+		useAppDispatch();
 
-	const { data, start } = usePolling( {
-		path: `${ API_NAMESPACE }/ads/accepted-customer-data-terms`,
-	} );
+	const { data, start } = usePolling(
+		{
+			path: `${ API_NAMESPACE }/ads/accepted-customer-data-terms`,
+		},
+		20
+	);
 
 	useEffect( () => {
 		start();
@@ -28,6 +32,8 @@ const PendingStatus = () => {
 				? ENHANCED_ADS_CONVERSION_STATUS.DISABLED
 				: ENHANCED_ADS_CONVERSION_STATUS.ENABLED
 		);
+
+		invalidateResolution( 'getAcceptedCustomerDataTerms', [] );
 	}
 };
 
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
index f18f81d163..835e86303e 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
@@ -23,6 +23,8 @@ const CTA = ( {
 	disableLabel = __( 'Disable', 'google-listings-and-ads' ),
 	enableLabel = __( 'Enable', 'google-listings-and-ads' ),
 	onAcceptTermsClick,
+	onEnableClick,
+	onDisableClick,
 } ) => {
 	const { updateEnhancedAdsConversionStatus, invalidateResolution } =
 		useAppDispatch();
@@ -34,7 +36,7 @@ const CTA = ( {
 
 	useEffect( () => {
 		if (
-			allowEnhancedConversions !== ENHANCED_ADS_CONVERSION_STATUS.PENDING
+			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
 		) {
 			invalidateResolution( 'getAcceptedCustomerDataTerms', [] );
 		}
@@ -58,7 +60,13 @@ const CTA = ( {
 		updateEnhancedAdsConversionStatus(
 			ENHANCED_ADS_CONVERSION_STATUS.DISABLED
 		);
-	}, [ updateEnhancedAdsConversionStatus, acceptedCustomerDataTerms ] );
+
+		onDisableClick?.();
+	}, [
+		updateEnhancedAdsConversionStatus,
+		acceptedCustomerDataTerms,
+		onDisableClick,
+	] );
 
 	const handleEnable = useCallback( () => {
 		if ( ! acceptedCustomerDataTerms ) {
@@ -68,7 +76,13 @@ const CTA = ( {
 		updateEnhancedAdsConversionStatus(
 			ENHANCED_ADS_CONVERSION_STATUS.ENABLED
 		);
-	}, [ updateEnhancedAdsConversionStatus, acceptedCustomerDataTerms ] );
+
+		onEnableClick?.();
+	}, [
+		updateEnhancedAdsConversionStatus,
+		acceptedCustomerDataTerms,
+		onEnableClick,
+	] );
 
 	if ( ! hasFinishedResolution ) {
 		return <Spinner />;
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
index d2526391b5..47a7c3ea8b 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
@@ -14,7 +14,7 @@ import CTA from '.~/components/enhanced-conversion-tracking-settings/cta';
 const EnhancedConversionFooter = ( { handleGuideFinish } ) => {
 	const { createNotice } = useDispatchCoreNotices();
 
-	const handleOnAcceptTermsClick = useCallback( () => {
+	const handleEnableOrDisableClick = useCallback( () => {
 		createNotice(
 			'info',
 			__( 'Status succesfully set', 'google-listings-and-ads' )
@@ -28,7 +28,8 @@ const EnhancedConversionFooter = ( { handleGuideFinish } ) => {
 			<div className="gla-submission-success-guide__space_holder" />
 
 			<CTA
-				onAcceptTermsClick={ handleOnAcceptTermsClick }
+				onEnableClick={ handleEnableOrDisableClick }
+				onDisableClick={ handleEnableOrDisableClick }
 				acceptTermsLabel={ __(
 					'Sign terms of service on Google Ads',
 					'google-listings-and-ads'
diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index bb86d666bd..732451a1ee 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -371,13 +371,13 @@ public function update_enhanced_conversion_status( string $status ): string {
 
 	/**
 	 * @TODO: wire properly
-	 * Updates the enhanced ads conversion status.
+	 * Updates the enhanced ads conversion status. Possible values are: enabled, disabled and pending
 	 * Returns false for any failures.
 	 *
 	 * @return string
 	 */
 	public function get_enhanced_conversion_status(): string {
 		// @TODO: Wire properly
-		return 'pending';
+		return 'enabled';
 	}
 }

From 2ee6242db80d4635c1e9ae4150afb95c23c81f7e Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Mon, 12 Feb 2024 18:41:08 +0530
Subject: [PATCH 12/95] API endpoint to read/write enhanced conversion status

---
 src/API/Google/Ads.php                        | 30 +++++++++++++------
 .../Controllers/Ads/AccountController.php     |  8 +++--
 src/Options/OptionsInterface.php              |  1 +
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index bb86d666bd..5c4a929aa3 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -363,21 +363,33 @@ public function get_accepted_customer_data_terms(): ?bool {
 	 * @param string $status The status value
 	 *
 	 * @return string
+	 * @throws Exception When the status is invalid.
 	 */
 	public function update_enhanced_conversion_status( string $status ): string {
-		// @TODO: Wire properly
-		return $status;
+		$status = strtolower( $status );
+		// Ensure that the option belongs to one of the predefined values.
+		if ( ! in_array( $status, [ 'enabled', 'disabled', 'pending' ], true ) ) {
+			throw new Exception( __( 'Invalid state for enhanced conversion', 'google-listings-and-ads' ), 400 );
+		}
+
+		$result = $this->options->update( OptionsInterface::ENHANCE_CONVERSION_STATUS, $status );
+
+		// Return the status when operation successful.
+		if ( $result ) {
+			return $status;
+		}
+
+		throw new Exception( __( 'Request could not be completed', 'google-listings-and-ads' ), 500 );
 	}
 
 	/**
-	 * @TODO: wire properly
-	 * Updates the enhanced ads conversion status.
-	 * Returns false for any failures.
+	 * Retrieve the enhanced ads conversion status.
 	 *
-	 * @return string
+	 * @return string|null
 	 */
-	public function get_enhanced_conversion_status(): string {
-		// @TODO: Wire properly
-		return 'pending';
+	public function get_enhanced_conversion_status(): ?string {
+		$result = $this->options->get( OptionsInterface::ENHANCE_CONVERSION_STATUS, null );
+
+		return $result;
 	}
 }
diff --git a/src/API/Site/Controllers/Ads/AccountController.php b/src/API/Site/Controllers/Ads/AccountController.php
index 073b25ae0c..9e959e525c 100644
--- a/src/API/Site/Controllers/Ads/AccountController.php
+++ b/src/API/Site/Controllers/Ads/AccountController.php
@@ -229,8 +229,12 @@ protected function update_enhanced_ads_conversion_callback(): callable {
 	 * @return callable
 	 */
 	protected function get_enhanced_conversion_status_callback(): callable {
-		return function () {
-			return $this->account->get_enhanced_conversion_status();
+		return function ( Request $request ) {
+			try {
+				return $this->account->get_enhanced_conversion_status();
+			} catch ( Exception $e ) {
+				return $this->response_from_exception( $e );
+			}
 		};
 	}
 
diff --git a/src/Options/OptionsInterface.php b/src/Options/OptionsInterface.php
index 3dafa5a93b..b3e0ff7185 100644
--- a/src/Options/OptionsInterface.php
+++ b/src/Options/OptionsInterface.php
@@ -23,6 +23,7 @@ interface OptionsInterface {
 	public const CONTACT_INFO_SETUP                        = 'contact_info_setup';
 	public const DELAYED_ACTIVATE                          = 'delayed_activate';
 	public const DB_VERSION                                = 'db_version';
+	public const ENHANCE_CONVERSION_STATUS                 = 'enhanced_conversion_status';
 	public const FILE_VERSION                              = 'file_version';
 	public const GOOGLE_CONNECTED                          = 'google_connected';
 	public const INSTALL_TIMESTAMP                         = 'install_timestamp';

From e29cbc96e2e20120159c0ac0fdbf1e6d2532660a Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Mon, 12 Feb 2024 18:44:02 +0530
Subject: [PATCH 13/95] Update docblock

---
 src/API/Google/Ads.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index aa7c329282..fb73ea85be 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -356,9 +356,7 @@ public function get_accepted_customer_data_terms(): ?bool {
 	}
 
 	/**
-	 * @TODO: wire properly
 	 * Updates the enhanced ads conversion status.
-	 * Returns false for any failures.
 	 *
 	 * @param string $status The status value
 	 *

From af8eaf8c8868f0910fc39f91b1b9e33f8339da10 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Mon, 12 Feb 2024 17:19:42 +0400
Subject: [PATCH 14/95] Add tests for CTA component.

---
 .../cta/PendingStatus.js                      |   2 +
 .../cta/index.js                              |   2 +
 .../cta/index.test.js                         | 130 ++++++++++++++++++
 3 files changed, 134 insertions(+)
 create mode 100644 js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js b/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js
index 71b74f53f0..d4959f46df 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js
@@ -35,6 +35,8 @@ const PendingStatus = () => {
 
 		invalidateResolution( 'getAcceptedCustomerDataTerms', [] );
 	}
+
+	return null;
 };
 
 export default PendingStatus;
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
index 835e86303e..dd70ec3701 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
@@ -122,6 +122,8 @@ const CTA = ( {
 			</>
 		);
 	}
+
+	return null;
 };
 
 export default CTA;
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
new file mode 100644
index 0000000000..951b4e4fd9
--- /dev/null
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
@@ -0,0 +1,130 @@
+jest.mock( '@woocommerce/components', () => ( {
+	...jest.requireActual( '@woocommerce/components' ),
+	Spinner: jest
+		.fn( () => <div role="status" aria-label="spinner" /> )
+		.mockName( 'Spinner' ),
+} ) );
+
+jest.mock( '.~/hooks/useAcceptedCustomerDataTerms', () => ( {
+	__esModule: true,
+	default: jest.fn().mockName( 'useAcceptedCustomerDataTerms' ),
+} ) );
+
+jest.mock( '.~/hooks/useAllowEnhancedConversions', () => ( {
+	__esModule: true,
+	default: jest.fn().mockName( 'useAllowEnhancedConversions' ),
+} ) );
+
+jest.mock( '.~/hooks/usePolling', () => ( {
+	__esModule: true,
+	default: jest
+		.fn()
+		.mockName( 'usePolling' )
+		.mockImplementation( () => {
+			return {
+				start: () => {},
+				data: { status: null },
+			};
+		} ),
+} ) );
+
+/**
+ * External dependencies
+ */
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
+
+/**
+ * Internal dependencies
+ */
+import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
+import CTA from './index';
+
+describe( 'Enhanced Conversion CTA', () => {
+	test( 'When not yet loaded, should render a loading spinner', () => {
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: false,
+			isResolving: false,
+			hasFinishedResolution: false,
+		} );
+
+		useAllowEnhancedConversions.mockReturnValue( {
+			allowEnhancedConversions: null,
+			isResolving: false,
+		} );
+
+		render( <CTA /> );
+		const spinner = screen.getByRole( 'status', { name: 'spinner' } );
+		expect( spinner ).toBeInTheDocument();
+	} );
+
+	test( 'Prompt the user to sign the TOS', () => {
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: false,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+
+		useAllowEnhancedConversions.mockReturnValue( {
+			allowEnhancedConversions: null,
+			isResolving: false,
+		} );
+
+		render(
+			<CTA acceptTermsLabel="Sign terms of service on Google Ads" />
+		);
+		expect(
+			screen.getByText( 'Sign terms of service on Google Ads' )
+		).toBeInTheDocument();
+	} );
+
+	test( 'Prompt the user to enable enhanced conversion tracking if the TOS has been accepted', () => {
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: true,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+
+		useAllowEnhancedConversions.mockReturnValue( {
+			allowEnhancedConversions: 'disabled',
+			isResolving: false,
+		} );
+
+		render( <CTA enableLabel="Confirm" /> );
+		expect( screen.getByText( 'Confirm' ) ).toBeInTheDocument();
+	} );
+
+	test( 'Prompt the user to disable enhanced conversion tracking if enabled', () => {
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: true,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+
+		useAllowEnhancedConversions.mockReturnValue( {
+			allowEnhancedConversions: 'enabled',
+			isResolving: false,
+		} );
+
+		render( <CTA disableLabel="Disable tracking" /> );
+		expect( screen.getByText( 'Disable tracking' ) ).toBeInTheDocument();
+	} );
+
+	test( 'Render a spinner when the status is set to pending', () => {
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: true,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+
+		useAllowEnhancedConversions.mockReturnValue( {
+			allowEnhancedConversions: 'pending',
+			isResolving: false,
+		} );
+
+		render( <CTA /> );
+		const spinner = screen.getByRole( 'status', { name: 'spinner' } );
+		expect( spinner ).toBeInTheDocument();
+	} );
+} );

From 4b6461dcadd1452c220f81337432fdd3b0c167a8 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Mon, 12 Feb 2024 22:15:40 +0530
Subject: [PATCH 15/95] API to read/write EC

---
 src/API/Google/Ads.php            | 4 ++--
 src/Options/OptionsInterface.php  | 2 +-
 tests/Unit/API/Google/AdsTest.php | 9 +++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index fb73ea85be..8237b6d9ca 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -370,7 +370,7 @@ public function update_enhanced_conversion_status( string $status ): string {
 			throw new Exception( __( 'Invalid state for enhanced conversion', 'google-listings-and-ads' ), 400 );
 		}
 
-		$result = $this->options->update( OptionsInterface::ENHANCE_CONVERSION_STATUS, $status );
+		$result = $this->options->update( OptionsInterface::ENHANCED_CONVERSION_STATUS, $status );
 
 		// Return the status when operation successful.
 		if ( $result ) {
@@ -386,7 +386,7 @@ public function update_enhanced_conversion_status( string $status ): string {
 	 * @return string|null
 	 */
 	public function get_enhanced_conversion_status(): ?string {
-		$result = $this->options->get( OptionsInterface::ENHANCE_CONVERSION_STATUS, null );
+		$result = $this->options->get( OptionsInterface::ENHANCED_CONVERSION_STATUS, null );
 
 		return $result;
 	}
diff --git a/src/Options/OptionsInterface.php b/src/Options/OptionsInterface.php
index b3e0ff7185..825cb40e79 100644
--- a/src/Options/OptionsInterface.php
+++ b/src/Options/OptionsInterface.php
@@ -23,7 +23,7 @@ interface OptionsInterface {
 	public const CONTACT_INFO_SETUP                        = 'contact_info_setup';
 	public const DELAYED_ACTIVATE                          = 'delayed_activate';
 	public const DB_VERSION                                = 'db_version';
-	public const ENHANCE_CONVERSION_STATUS                 = 'enhanced_conversion_status';
+	public const ENHANCED_CONVERSION_STATUS                = 'enhanced_conversion_status';
 	public const FILE_VERSION                              = 'file_version';
 	public const GOOGLE_CONNECTED                          = 'google_connected';
 	public const INSTALL_TIMESTAMP                         = 'install_timestamp';
diff --git a/tests/Unit/API/Google/AdsTest.php b/tests/Unit/API/Google/AdsTest.php
index 9a6fbaaf0f..17a387dca5 100644
--- a/tests/Unit/API/Google/AdsTest.php
+++ b/tests/Unit/API/Google/AdsTest.php
@@ -282,4 +282,13 @@ public function test_update_billing_url() {
 			->willReturn( true );
 		$this->assertTrue( $this->ads->update_billing_url( self::TEST_BILLING_URL ) );
 	}
+
+	public function test_get_enhanced_conversion_status() {
+		$value = $this->options->expects( $this->once() )
+		->method( 'get' )
+		->with( OptionsInterface::ENHANCED_CONVERSION_STATUS )
+		->willReturn( 'enabled' );
+
+		$this->assertEquals( 'enabled', $value );
+	}
 }

From c6c0b2515d3ca9aac9ad8725b0900bc72df6fc79 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Mon, 12 Feb 2024 22:43:44 +0530
Subject: [PATCH 16/95] Fix: tests

---
 tests/Unit/API/Google/AdsTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Unit/API/Google/AdsTest.php b/tests/Unit/API/Google/AdsTest.php
index 17a387dca5..f1fec014aa 100644
--- a/tests/Unit/API/Google/AdsTest.php
+++ b/tests/Unit/API/Google/AdsTest.php
@@ -289,6 +289,6 @@ public function test_get_enhanced_conversion_status() {
 		->with( OptionsInterface::ENHANCED_CONVERSION_STATUS )
 		->willReturn( 'enabled' );
 
-		$this->assertEquals( 'enabled', $value );
+		$this->assertEquals( 'enabled', $this->ads->get_enhanced_conversion_status() );
 	}
 }

From 717ad0a85760ae4e40d0a86cd3571e4fa34afc4a Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Mon, 12 Feb 2024 23:05:24 +0530
Subject: [PATCH 17/95] Tests: update and get EC status

---
 tests/Unit/API/Google/AdsTest.php | 32 +++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/Unit/API/Google/AdsTest.php b/tests/Unit/API/Google/AdsTest.php
index f1fec014aa..8bdd756f09 100644
--- a/tests/Unit/API/Google/AdsTest.php
+++ b/tests/Unit/API/Google/AdsTest.php
@@ -291,4 +291,36 @@ public function test_get_enhanced_conversion_status() {
 
 		$this->assertEquals( 'enabled', $this->ads->get_enhanced_conversion_status() );
 	}
+
+	public function test_update_enhanced_conversion_status_with_invalid_status_throws_exception() {
+		$this->expectException( Exception::class );
+		$this->expectExceptionMessage('Invalid state for enhanced conversion');
+
+		$this->ads->update_enhanced_conversion_status( 'random_status' );
+	}
+
+	public function test_update_enhanced_conversion_status_with_failed_update_throws_exception() {
+		$this->options->expects( $this->once() )
+		->method( 'update' )
+		->with( OptionsInterface::ENHANCED_CONVERSION_STATUS )
+		->willReturn( false );
+
+		$this->expectException( Exception::class );
+		$this->expectExceptionMessage('Request could not be completed');
+
+		// Call with valid status.
+		$this->ads->update_enhanced_conversion_status( 'enabled' );
+	}
+
+	public function test_update_enhanced_conversion_status_with_valid_status_returns_status() {
+		$this->options->expects( $this->once() )
+		->method( 'update' )
+		->with( OptionsInterface::ENHANCED_CONVERSION_STATUS )
+		->willReturn( true );
+
+		// Call with valid status.
+		$status = $this->ads->update_enhanced_conversion_status( 'pending' );
+
+		$this->assertEquals( 'pending', $status );
+	}
 }

From 3ee62e48a31dcefb1c75cb0a9b241a12ddb10b0d Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Mon, 12 Feb 2024 23:30:35 +0530
Subject: [PATCH 18/95] Tests: ads controller

---
 .../Controllers/Ads/AccountControllerTest.php | 38 +++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php b/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
index 7326d3dca2..feb07088e2 100644
--- a/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
+++ b/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
@@ -22,13 +22,15 @@ class AccountControllerTest extends RESTControllerUnitTest {
 	/** @var AccountController $controller */
 	protected $controller;
 
-	protected const ROUTE_ACCOUNTS           = '/wc/gla/ads/accounts';
-	protected const ROUTE_CONNECTION         = '/wc/gla/ads/connection';
-	protected const ROUTE_BILLING_STATUS     = '/wc/gla/ads/billing-status';
-	protected const TEST_ACCOUNT_ID          = 1234567890;
-	protected const TEST_BILLING_URL         = 'https://domain.test/billing/setup/';
-	protected const TEST_BILLING_STATUS      = 'pending';
-	protected const TEST_ACCOUNTS            = [
+	protected const ROUTE_ACCOUNTS            = '/wc/gla/ads/accounts';
+	protected const ROUTE_CONNECTION          = '/wc/gla/ads/connection';
+	protected const ROUTE_BILLING_STATUS      = '/wc/gla/ads/billing-status';
+	protected const ROUTE_ACCEPTED_DATA_TERMS = '/wc/gla/ads/accepted-customer-data-terms';
+	protected const ROUTE_UPDATED_EC_STATUS   = '/wc/gla/ads/update-enhanced-conversion-status';
+	protected const TEST_ACCOUNT_ID           = 1234567890;
+	protected const TEST_BILLING_URL          = 'https://domain.test/billing/setup/';
+	protected const TEST_BILLING_STATUS       = 'pending';
+	protected const TEST_ACCOUNTS             = [
 		[
 			'id'   => self::TEST_ACCOUNT_ID,
 			'name' => 'Ads Account',
@@ -214,4 +216,26 @@ public function test_get_billing_status() {
 		$this->assertEquals( self::TEST_BILLING_STATUS_DATA, $response->get_data() );
 		$this->assertEquals( 200, $response->get_status() );
 	}
+
+	public function test_get_accepted_customer_data_terms() {
+		$expected_response = [ 'status' => 'pending' ];
+		$this->account->expects( $this->once() )
+		->method( 'get_accepted_customer_data_terms' )
+		->willReturn( $expected_response );
+
+		$response = $this->do_request( self::ROUTE_ACCEPTED_DATA_TERMS, 'GET' );
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( $expected_response, $response->get_data() );
+	}
+
+	public function test_update_enhanced_conversion_status() {
+		$expected_response = [ 'status' => 'pending' ];
+		$this->account->expects( $this->once() )
+		->method( 'update_enhanced_conversion_status' )
+		->willReturn( $expected_response );
+
+		$response = $this->do_request( self::ROUTE_UPDATED_EC_STATUS, 'POST', [ 'status' => 'pending' ] );
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( $expected_response, $response->get_data() );
+	}
 }

From 15e6a95cf773d9ec2b05ce0771884e4ffc793266 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Mon, 12 Feb 2024 23:58:43 +0530
Subject: [PATCH 19/95] Add EC status to valid options

---
 src/Options/OptionsInterface.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Options/OptionsInterface.php b/src/Options/OptionsInterface.php
index 825cb40e79..86d6e4fce4 100644
--- a/src/Options/OptionsInterface.php
+++ b/src/Options/OptionsInterface.php
@@ -54,6 +54,7 @@ interface OptionsInterface {
 		self::CLAIMED_URL_HASH                          => true,
 		self::CONTACT_INFO_SETUP                        => true,
 		self::DB_VERSION                                => true,
+		self::ENHANCED_CONVERSION_STATUS                => true,
 		self::FILE_VERSION                              => true,
 		self::GOOGLE_CONNECTED                          => true,
 		self::INSTALL_TIMESTAMP                         => true,

From 636f52b0348f0a8bc66b9383937c91524bf97c9d Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Tue, 13 Feb 2024 13:14:36 +0530
Subject: [PATCH 20/95] Fix: phpcs

---
 tests/Unit/API/Google/AdsTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Unit/API/Google/AdsTest.php b/tests/Unit/API/Google/AdsTest.php
index 8bdd756f09..fda9460eca 100644
--- a/tests/Unit/API/Google/AdsTest.php
+++ b/tests/Unit/API/Google/AdsTest.php
@@ -306,7 +306,7 @@ public function test_update_enhanced_conversion_status_with_failed_update_throws
 		->willReturn( false );
 
 		$this->expectException( Exception::class );
-		$this->expectExceptionMessage('Request could not be completed');
+		$this->expectExceptionMessage( 'Request could not be completed' );
 
 		// Call with valid status.
 		$this->ads->update_enhanced_conversion_status( 'enabled' );

From 13e7ee818d539d9262ab4ffe286c426dc1f8f6af Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 13 Feb 2024 11:44:36 +0400
Subject: [PATCH 21/95] Fix linting errors.

---
 .../enhanced-conversion-tracking-settings/index.js |  4 ++--
 js/src/constants.js                                |  1 -
 js/src/data/selectors.js                           |  8 ++++++--
 .../submission-success-guide/EnhancedConversion.js |  4 ++--
 tests/Unit/API/Google/AdsTest.php                  |  4 ++--
 .../Site/Controllers/Ads/AccountControllerTest.php | 14 +++++++-------
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/index.js b/js/src/components/enhanced-conversion-tracking-settings/index.js
index 9be9c7fe6d..87576e9367 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/index.js
@@ -16,7 +16,7 @@ import CTA from './cta';
 const DESCRIPTION = (
 	<p>
 		{ __(
-			'Improve your conversion tracking accuracy and unlock more powerful bidding.This feature works alongside your existing conversion tags, sending secure, privacy-friendly conversion data from your website to Google',
+			'Improve your conversion tracking accuracy and unlock more powerful bidding. This feature works alongside your existing conversion tags, sending secure, privacy-friendly conversion data from your website to Google.',
 			'google-listings-and-ads'
 		) }
 	</p>
@@ -40,7 +40,7 @@ const EnhancedConversionTrackingSettings = () => {
 	}
 
 	return (
-		<Section title={ TITLE } description={ <div>{ DESCRIPTION }</div> }>
+		<Section title={ TITLE } description={ DESCRIPTION }>
 			{ ! hasFinishedResolution && <SpinnerCard /> }
 
 			{ hasFinishedResolution && (
diff --git a/js/src/constants.js b/js/src/constants.js
index e64c4c9463..46aa330a12 100644
--- a/js/src/constants.js
+++ b/js/src/constants.js
@@ -113,7 +113,6 @@ export const ASSET_FORM_KEY = {
 };
 
 export const ENHANCED_ADS_CONVERSION_STATUS = {
-	UNKNOWN: 'unknown',
 	PENDING: 'pending',
 	ENABLED: 'enabled',
 	DISABLED: 'disabled',
diff --git a/js/src/data/selectors.js b/js/src/data/selectors.js
index 72c2febf40..473ed69045 100644
--- a/js/src/data/selectors.js
+++ b/js/src/data/selectors.js
@@ -8,6 +8,7 @@ import createSelector from 'rememo';
  * Internal dependencies
  */
 import { STORE_KEY } from './constants';
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import { getReportQuery, getReportKey, getPerformanceQuery } from './utils';
 
 /**
@@ -415,8 +416,11 @@ export const getAcceptedCustomerDataTerms = ( state ) => {
  * Return whether the user allowed enhanced conversion tracking.
  *
  * @param {Object} state The state
- * @return {boolean} TRUE if the user allowed enhanced conversion tracking.
+ * @return {string} Possible values are 'pending' | 'enabled' | 'disabled'
  */
 export const getAllowEnhancedConversions = ( state ) => {
-	return state.ads.conversion_tracking_setting.allow_enhanced_conversions;
+	return (
+		state.ads.conversion_tracking_setting.allow_enhanced_conversions ||
+		ENHANCED_ADS_CONVERSION_STATUS.PENDING
+	);
 };
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversion.js b/js/src/product-feed/submission-success-guide/EnhancedConversion.js
index 3d84af04e0..e06ebbb451 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversion.js
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversion.js
@@ -27,11 +27,11 @@ const EnhancedConversion = () => {
 			<p>
 				{ createInterpolateElement(
 					__(
-						'Enhance your conversion tracking accuracy and empower your bidding strategy with our latest feature: <b>Enhanced Conversion Tracking</b>. This feature seamlessly integrates with your existing conversion tags, ensuring the secure and privacy-conscious transmission of conversion data from your website to Google',
+						'Enhance your conversion tracking accuracy and empower your bidding strategy with our latest feature: <strong>Enhanced Conversion Tracking</strong>. This feature seamlessly integrates with your existing conversion tags, ensuring the secure and privacy-conscious transmission of conversion data from your website to Google.',
 						'google-listings-and-ads'
 					),
 					{
-						b: <b />,
+						strong: <strong />,
 					}
 				) }
 			</p>
diff --git a/tests/Unit/API/Google/AdsTest.php b/tests/Unit/API/Google/AdsTest.php
index 8bdd756f09..1ea14878fb 100644
--- a/tests/Unit/API/Google/AdsTest.php
+++ b/tests/Unit/API/Google/AdsTest.php
@@ -294,7 +294,7 @@ public function test_get_enhanced_conversion_status() {
 
 	public function test_update_enhanced_conversion_status_with_invalid_status_throws_exception() {
 		$this->expectException( Exception::class );
-		$this->expectExceptionMessage('Invalid state for enhanced conversion');
+		$this->expectExceptionMessage( 'Invalid state for enhanced conversion' );
 
 		$this->ads->update_enhanced_conversion_status( 'random_status' );
 	}
@@ -306,7 +306,7 @@ public function test_update_enhanced_conversion_status_with_failed_update_throws
 		->willReturn( false );
 
 		$this->expectException( Exception::class );
-		$this->expectExceptionMessage('Request could not be completed');
+		$this->expectExceptionMessage( 'Request could not be completed' );
 
 		// Call with valid status.
 		$this->ads->update_enhanced_conversion_status( 'enabled' );
diff --git a/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php b/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
index feb07088e2..4d2ea2fb02 100644
--- a/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
+++ b/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
@@ -40,29 +40,29 @@ class AccountControllerTest extends RESTControllerUnitTest {
 			'name' => 'Other Account',
 		],
 	];
-	protected const TEST_NO_ACCOUNTS         = [];
-	protected const TEST_ACCOUNT_CREATE_DATA = [
+	protected const TEST_NO_ACCOUNTS          = [];
+	protected const TEST_ACCOUNT_CREATE_DATA  = [
 		'id'          => self::TEST_ACCOUNT_ID,
 		'billing_url' => self::TEST_BILLING_URL,
 	];
-	protected const TEST_ACCOUNT_LINK_ARGS   = [ 'id' => self::TEST_ACCOUNT_ID ];
-	protected const TEST_ACCOUNT_LINK_DATA   = [
+	protected const TEST_ACCOUNT_LINK_ARGS    = [ 'id' => self::TEST_ACCOUNT_ID ];
+	protected const TEST_ACCOUNT_LINK_DATA    = [
 		'id'          => self::TEST_ACCOUNT_ID,
 		'billing_url' => null,
 	];
-	protected const TEST_CONNECTED_DATA      = [
+	protected const TEST_CONNECTED_DATA       = [
 		'id'       => self::TEST_ACCOUNT_ID,
 		'currency' => 'EUR',
 		'symbol'   => '€',
 		'status'   => 'connected',
 	];
-	protected const TEST_DISCONNECTED_DATA   = [
+	protected const TEST_DISCONNECTED_DATA    = [
 		'id'       => 0,
 		'currency' => null,
 		'symbol'   => '€',
 		'status'   => 'disconnected',
 	];
-	protected const TEST_BILLING_STATUS_DATA = [
+	protected const TEST_BILLING_STATUS_DATA  = [
 		'status'      => self::TEST_BILLING_STATUS,
 		'billing_url' => self::TEST_BILLING_URL,
 	];

From 71bfadbee05a07e452bd94f1fbdaa74c561db0e7 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Tue, 13 Feb 2024 13:49:34 +0530
Subject: [PATCH 22/95] Remove non-required test

---
 src/API/Google/Ads.php            |  9 ++-------
 tests/Unit/API/Google/AdsTest.php | 13 -------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index 8237b6d9ca..90f0ff19cf 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -370,14 +370,9 @@ public function update_enhanced_conversion_status( string $status ): string {
 			throw new Exception( __( 'Invalid state for enhanced conversion', 'google-listings-and-ads' ), 400 );
 		}
 
-		$result = $this->options->update( OptionsInterface::ENHANCED_CONVERSION_STATUS, $status );
+		$this->options->update( OptionsInterface::ENHANCED_CONVERSION_STATUS, $status );
 
-		// Return the status when operation successful.
-		if ( $result ) {
-			return $status;
-		}
-
-		throw new Exception( __( 'Request could not be completed', 'google-listings-and-ads' ), 500 );
+		return $status;
 	}
 
 	/**
diff --git a/tests/Unit/API/Google/AdsTest.php b/tests/Unit/API/Google/AdsTest.php
index 1ea14878fb..2a68e51376 100644
--- a/tests/Unit/API/Google/AdsTest.php
+++ b/tests/Unit/API/Google/AdsTest.php
@@ -299,19 +299,6 @@ public function test_update_enhanced_conversion_status_with_invalid_status_throw
 		$this->ads->update_enhanced_conversion_status( 'random_status' );
 	}
 
-	public function test_update_enhanced_conversion_status_with_failed_update_throws_exception() {
-		$this->options->expects( $this->once() )
-		->method( 'update' )
-		->with( OptionsInterface::ENHANCED_CONVERSION_STATUS )
-		->willReturn( false );
-
-		$this->expectException( Exception::class );
-		$this->expectExceptionMessage( 'Request could not be completed' );
-
-		// Call with valid status.
-		$this->ads->update_enhanced_conversion_status( 'enabled' );
-	}
-
 	public function test_update_enhanced_conversion_status_with_valid_status_returns_status() {
 		$this->options->expects( $this->once() )
 		->method( 'update' )

From dbd8a18ab176120b2e93cfe94374039b2b53d3ea Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 13 Feb 2024 13:26:10 +0400
Subject: [PATCH 23/95] Use new hook instead of usePolling hook for pending
 status.

---
 .../cta/PendingStatus.js                      | 34 +----------
 .../cta/index.js                              | 25 ++++----
 js/src/data/selectors.js                      |  5 +-
 .../useAutoCheckEnhancedConversionTOS.js      | 58 +++++++++++++++++++
 .../EnhancedConversion.js                     |  4 +-
 .../submission-success-guide/index.js         | 22 ++++---
 6 files changed, 93 insertions(+), 55 deletions(-)
 create mode 100644 js/src/hooks/useAutoCheckEnhancedConversionTOS.js

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js b/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js
index d4959f46df..3cbcec60d2 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js
@@ -1,40 +1,10 @@
-/**
- * External dependencies
- */
-import { useEffect } from '@wordpress/element';
-
 /**
  * Internal dependencies
  */
-import { useAppDispatch } from '.~/data';
-import { API_NAMESPACE } from '.~/data/constants';
-import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
-import usePolling from '.~/hooks/usePolling';
+import useAutoCheckEnhancedConversionTOS from '.~/hooks/useAutoCheckEnhancedConversionTOS';
 
 const PendingStatus = () => {
-	const { updateEnhancedAdsConversionStatus, invalidateResolution } =
-		useAppDispatch();
-
-	const { data, start } = usePolling(
-		{
-			path: `${ API_NAMESPACE }/ads/accepted-customer-data-terms`,
-		},
-		20
-	);
-
-	useEffect( () => {
-		start();
-	}, [ start ] );
-
-	if ( data && data.status !== null ) {
-		updateEnhancedAdsConversionStatus(
-			data.status
-				? ENHANCED_ADS_CONVERSION_STATUS.DISABLED
-				: ENHANCED_ADS_CONVERSION_STATUS.ENABLED
-		);
-
-		invalidateResolution( 'getAcceptedCustomerDataTerms', [] );
-	}
+	useAutoCheckEnhancedConversionTOS();
 
 	return null;
 };
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
index dd70ec3701..d95d4e8b85 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
@@ -88,6 +88,18 @@ const CTA = ( {
 		return <Spinner />;
 	}
 
+	if (
+		! acceptedCustomerDataTerms &&
+		allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
+	) {
+		return (
+			<>
+				<AppButton isSecondary disabled loading></AppButton>
+				<PendingStatus />
+			</>
+		);
+	}
+
 	if ( ! acceptedCustomerDataTerms ) {
 		return (
 			<AppButton isPrimary onClick={ handleTOS }>
@@ -104,8 +116,10 @@ const CTA = ( {
 		);
 	}
 
+	// User has accepted TOS but has not enabled enhanced tracking.
 	if (
-		allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.DISABLED
+		allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.DISABLED ||
+		acceptedCustomerDataTerms
 	) {
 		return (
 			<AppButton isPrimary onClick={ handleEnable }>
@@ -114,15 +128,6 @@ const CTA = ( {
 		);
 	}
 
-	if ( allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING ) {
-		return (
-			<>
-				<AppButton isSecondary disabled loading></AppButton>
-				<PendingStatus />
-			</>
-		);
-	}
-
 	return null;
 };
 
diff --git a/js/src/data/selectors.js b/js/src/data/selectors.js
index 473ed69045..43814cadfd 100644
--- a/js/src/data/selectors.js
+++ b/js/src/data/selectors.js
@@ -419,8 +419,5 @@ export const getAcceptedCustomerDataTerms = ( state ) => {
  * @return {string} Possible values are 'pending' | 'enabled' | 'disabled'
  */
 export const getAllowEnhancedConversions = ( state ) => {
-	return (
-		state.ads.conversion_tracking_setting.allow_enhanced_conversions ||
-		ENHANCED_ADS_CONVERSION_STATUS.PENDING
-	);
+	return state.ads.conversion_tracking_setting.allow_enhanced_conversions;
 };
diff --git a/js/src/hooks/useAutoCheckEnhancedConversionTOS.js b/js/src/hooks/useAutoCheckEnhancedConversionTOS.js
new file mode 100644
index 0000000000..fa815d94f1
--- /dev/null
+++ b/js/src/hooks/useAutoCheckEnhancedConversionTOS.js
@@ -0,0 +1,58 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useCallback, useRef } from '@wordpress/element';
+import apiFetch from '@wordpress/api-fetch';
+import { noop } from 'lodash';
+
+/**
+ * Internal dependencies
+ */
+import { useAppDispatch } from '.~/data';
+import { API_NAMESPACE } from '.~/data/constants';
+import useDispatchCoreNotices from '.~/hooks/useDispatchCoreNotices';
+import useWindowFocusCallbackIntervalEffect from '.~/hooks/useWindowFocusCallbackIntervalEffect';
+
+const useAutoCheckEnhancedConversionTOS = ( onStatusAccepted = noop ) => {
+	const { createNotice } = useDispatchCoreNotices();
+	const { receiveAcceptedTerms } = useAppDispatch();
+	const prevStatusRef = useRef();
+
+	const onStatusAcceptedRef = useRef();
+	onStatusAcceptedRef.current = onStatusAccepted;
+
+	const checkStatus = useCallback( async () => {
+		const prevStatus = prevStatusRef.current;
+		const tosStatus = await apiFetch( {
+			path: `${ API_NAMESPACE }/ads/accepted-customer-data-terms`,
+		} );
+
+		prevStatusRef.current = tosStatus.status;
+
+		// Prevent the completion API and callback from being called unwanted times due to
+		// the regain focus or interval timer after the status is approved.
+		if ( prevStatus === tosStatus.status || tosStatus.status !== true ) {
+			return;
+		}
+
+		try {
+			await onStatusAcceptedRef.current();
+
+			console.log( tosStatus );
+			receiveAcceptedTerms( tosStatus );
+		} catch ( e ) {
+			createNotice(
+				'error',
+				__(
+					'Unable to complete request. Please try again later.',
+					'google-listings-and-ads'
+				)
+			);
+		}
+	}, [ receiveAcceptedTerms, createNotice ] );
+
+	useWindowFocusCallbackIntervalEffect( checkStatus, 30 );
+};
+
+export default useAutoCheckEnhancedConversionTOS;
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversion.js b/js/src/product-feed/submission-success-guide/EnhancedConversion.js
index e06ebbb451..623aba4758 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversion.js
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversion.js
@@ -42,7 +42,7 @@ const EnhancedConversion = () => {
 				/>
 			) }
 
-			{ hasAcceptedTerms === true && (
+			{ hasAcceptedTerms === true && hasFinishedResolution && (
 				<p>
 					{ __(
 						'Clicking confirm will enable Enhanced Conversions on your account and update your tags accordingly. This feature can also be managed from Google Listings & Ads > Settings',
@@ -51,7 +51,7 @@ const EnhancedConversion = () => {
 				</p>
 			) }
 
-			{ hasAcceptedTerms === false && (
+			{ hasAcceptedTerms === false && hasFinishedResolution && (
 				<p>
 					{ __(
 						'Activating it is easy – just agree to the terms of service on Google Ads and we will make the tagging changes needed for you. This feature can also be managed from Google Listings & Ads > Settings',
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index df3984df56..b9ff56a956 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -19,7 +19,12 @@ import GuidePageContent, {
 } from '.~/components/guide-page-content';
 import AppButton from '.~/components/app-button';
 import AddPaidCampaignButton from '.~/components/paid-ads/add-paid-campaign-button';
-import { glaData, GUIDE_NAMES, LOCAL_STORAGE_KEYS } from '.~/constants';
+import {
+	glaData,
+	GUIDE_NAMES,
+	LOCAL_STORAGE_KEYS,
+	GOOGLE_ADS_ACCOUNT_STATUS,
+} from '.~/constants';
 import localStorage from '.~/utils/localStorage';
 import { getProductFeedUrl } from '.~/utils/urls';
 import wooLogoURL from './woocommerce-logo.svg';
@@ -27,7 +32,7 @@ import googleLogoURL from '.~/images/google-logo.svg';
 import { recordGlaEvent } from '.~/utils/tracks';
 import EnhancedConversion from './EnhancedConversion';
 import EnhancedConversionFooter from './EnhancedConversionFooter';
-import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
 import './index.scss';
 
 const EVENT_NAME = 'gla_modal_closed';
@@ -133,9 +138,7 @@ const PAGES = {
  */
 const SubmissionSuccessGuide = () => {
 	const { data: campaigns } = useAdsCampaigns();
-
-	// side effects
-	useAcceptedCustomerDataTerms();
+	const { googleAdsAccount, hasFinishedResolution } = useGoogleAdsAccount();
 
 	useEffect( () => {
 		recordGlaEvent( 'gla_modal_open', {
@@ -153,10 +156,15 @@ const SubmissionSuccessGuide = () => {
 	// @todo: Review whether we need that function since we have moved the buttons to be per page now.
 	const renderFinish = useCallback( () => null, [] );
 
-	const showEnhancedConversionTrackingScreen = glaData.adsSetupComplete;
+	// @todo: Review condition to display EC tracking screen. How do we get paid campaigns?
+	const showEnhancedConversionTrackingScreen =
+		// campaigns?.length &&
+		googleAdsAccount?.status === GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED &&
+		hasFinishedResolution;
 
 	// @todo: Review logic to display credits screen. How do we get the paid campaigns?
-	const showGoogleAdsCreditsScreen = ! campaigns?.length;
+	const showGoogleAdsCreditsScreen =
+		! campaigns?.length && hasFinishedResolution;
 
 	if ( showEnhancedConversionTrackingScreen ) {
 		// Add conversion screen if ads setup is complete

From 679253d425aeaf511c9fba8aa07e6a5d726d86ab Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 13 Feb 2024 13:40:37 +0400
Subject: [PATCH 24/95] Fix linting issues.

---
 .../cta/index.test.js                         | 21 +++++++------------
 js/src/data/selectors.js                      |  1 -
 .../useAutoCheckEnhancedConversionTOS.js      |  2 --
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
index 951b4e4fd9..a448e50d80 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
@@ -15,17 +15,9 @@ jest.mock( '.~/hooks/useAllowEnhancedConversions', () => ( {
 	default: jest.fn().mockName( 'useAllowEnhancedConversions' ),
 } ) );
 
-jest.mock( '.~/hooks/usePolling', () => ( {
+jest.mock( '.~/hooks/useAutoCheckEnhancedConversionTOS', () => ( {
 	__esModule: true,
-	default: jest
-		.fn()
-		.mockName( 'usePolling' )
-		.mockImplementation( () => {
-			return {
-				start: () => {},
-				data: { status: null },
-			};
-		} ),
+	default: jest.fn().mockName( 'useAutoCheckEnhancedConversionTOS' ),
 } ) );
 
 /**
@@ -39,6 +31,7 @@ import '@testing-library/jest-dom';
  */
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import CTA from './index';
 
 describe( 'Enhanced Conversion CTA', () => {
@@ -87,7 +80,7 @@ describe( 'Enhanced Conversion CTA', () => {
 		} );
 
 		useAllowEnhancedConversions.mockReturnValue( {
-			allowEnhancedConversions: 'disabled',
+			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.DISABLED,
 			isResolving: false,
 		} );
 
@@ -103,7 +96,7 @@ describe( 'Enhanced Conversion CTA', () => {
 		} );
 
 		useAllowEnhancedConversions.mockReturnValue( {
-			allowEnhancedConversions: 'enabled',
+			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.ENABLED,
 			isResolving: false,
 		} );
 
@@ -113,13 +106,13 @@ describe( 'Enhanced Conversion CTA', () => {
 
 	test( 'Render a spinner when the status is set to pending', () => {
 		useAcceptedCustomerDataTerms.mockReturnValue( {
-			acceptedCustomerDataTerms: true,
+			acceptedCustomerDataTerms: false,
 			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 
 		useAllowEnhancedConversions.mockReturnValue( {
-			allowEnhancedConversions: 'pending',
+			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.PENDING,
 			isResolving: false,
 		} );
 
diff --git a/js/src/data/selectors.js b/js/src/data/selectors.js
index 43814cadfd..eba48c3a5a 100644
--- a/js/src/data/selectors.js
+++ b/js/src/data/selectors.js
@@ -8,7 +8,6 @@ import createSelector from 'rememo';
  * Internal dependencies
  */
 import { STORE_KEY } from './constants';
-import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import { getReportQuery, getReportKey, getPerformanceQuery } from './utils';
 
 /**
diff --git a/js/src/hooks/useAutoCheckEnhancedConversionTOS.js b/js/src/hooks/useAutoCheckEnhancedConversionTOS.js
index fa815d94f1..b853849638 100644
--- a/js/src/hooks/useAutoCheckEnhancedConversionTOS.js
+++ b/js/src/hooks/useAutoCheckEnhancedConversionTOS.js
@@ -38,8 +38,6 @@ const useAutoCheckEnhancedConversionTOS = ( onStatusAccepted = noop ) => {
 
 		try {
 			await onStatusAcceptedRef.current();
-
-			console.log( tosStatus );
 			receiveAcceptedTerms( tosStatus );
 		} catch ( e ) {
 			createNotice(

From 16b6767a81f042a1af1beceadf7fb83fdd884f37 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Tue, 13 Feb 2024 15:29:30 +0530
Subject: [PATCH 25/95] Tests: Ads controller

---
 .../Site/Controllers/Ads/AccountControllerTest.php   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php b/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
index 4d2ea2fb02..ade8ce7c7f 100644
--- a/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
+++ b/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
@@ -27,6 +27,7 @@ class AccountControllerTest extends RESTControllerUnitTest {
 	protected const ROUTE_BILLING_STATUS      = '/wc/gla/ads/billing-status';
 	protected const ROUTE_ACCEPTED_DATA_TERMS = '/wc/gla/ads/accepted-customer-data-terms';
 	protected const ROUTE_UPDATED_EC_STATUS   = '/wc/gla/ads/update-enhanced-conversion-status';
+	protected const ROUTE_GET_EC_STATUS       = '/wc/gla/ads/allow-enhance-conversions';
 	protected const TEST_ACCOUNT_ID           = 1234567890;
 	protected const TEST_BILLING_URL          = 'https://domain.test/billing/setup/';
 	protected const TEST_BILLING_STATUS       = 'pending';
@@ -238,4 +239,15 @@ public function test_update_enhanced_conversion_status() {
 		$this->assertEquals( 200, $response->get_status() );
 		$this->assertEquals( $expected_response, $response->get_data() );
 	}
+
+	public function test_get_enhanced_conversion_status() {
+		$expected_response = [ 'status' => 'pending' ];
+		$this->account->expects( $this->once() )
+		->method( 'get_enhanced_conversion_status' )
+		->willReturn( $expected_response );
+
+		$response = $this->do_request( self::ROUTE_GET_EC_STATUS, 'GET' );
+		$this->assertEquals( 200, $response->get_status() );
+		$this->assertEquals( $expected_response, $response->get_data() );
+	}
 }

From cff4675a3777c273dc4a999000e9cd034d6e6e9d Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Tue, 13 Feb 2024 21:07:19 +0530
Subject: [PATCH 26/95] Add config for enhanced conversion

---
 src/Google/GlobalSiteTag.php | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/Google/GlobalSiteTag.php b/src/Google/GlobalSiteTag.php
index c3348242c5..39d20c70e4 100644
--- a/src/Google/GlobalSiteTag.php
+++ b/src/Google/GlobalSiteTag.php
@@ -220,9 +220,10 @@ public function activate_global_site_tag( string $ads_conversion_id ) {
 			add_filter(
 				'woocommerce_gtag_snippet',
 				function ( $gtag_snippet ) use ( $ads_conversion_id ) {
+					$config = wp_json_encode( $this->get_config_object() );
 					return preg_replace(
 						'~(\s)</script>~',
-						"\tgtag('config', '" . $ads_conversion_id . "', { 'groups': 'GLA', 'send_page_view': false });\n$1</script>",
+						"\tgtag('config', '" . $ads_conversion_id . "', $config);\n$1</script>",
 						$gtag_snippet
 					);
 				}
@@ -238,6 +239,7 @@ function ( $gtag_snippet ) use ( $ads_conversion_id ) {
 	 * @param string $ads_conversion_id Google Ads account conversion ID.
 	 */
 	protected function display_global_site_tag( string $ads_conversion_id ) {
+		$config = $this->get_config_object();
 		// phpcs:disable WordPress.WP.EnqueuedResources.NonEnqueuedScript
 		?>
 
@@ -249,10 +251,7 @@ function gtag() { dataLayer.push(arguments); }
 
 			gtag('js', new Date());
 			gtag('set', 'developer_id.<?php echo esc_js( self::DEVELOPER_ID ); ?>', true);
-			gtag('config', '<?php echo esc_js( $ads_conversion_id ); ?>', {
-				'groups': 'GLA',
-				'send_page_view': false
-			});
+			gtag('config', '<?php echo esc_js( $ads_conversion_id ); ?>', <?php echo wp_json_encode( $config ); // phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped ?>);
 		</script>
 
 		<?php
@@ -521,4 +520,27 @@ private function register_js_for_fast_refresh_dev() {
 			false
 		);
 	}
+
+	/**
+	 * Get the config object for Google tag.
+	 *
+	 * @return array
+	 */
+	private function get_config_object() {
+		// Standard config.
+		$config = [
+			'groups'         => 'GLA',
+			'send_page_view' => false,
+		];
+
+		// Check if enhanced conversion is enabled.
+		$enhanced_conversion_status  = $this->options->get( OptionsInterface::ENHANCED_CONVERSION_STATUS, null );
+		$enhanced_conversion_enabled = ( 'enabled' === $enhanced_conversion_status );
+
+		if ( $enhanced_conversion_enabled ) {
+			$config['allow_enhanced_conversions'] = true;
+		}
+
+		return $config;
+	}
 }

From c063f68302bf32e67b7da7543aa72c95955e3bc3 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Wed, 14 Feb 2024 17:57:53 +0400
Subject: [PATCH 27/95] Review condition to display EC screen.

---
 .../product-feed/submission-success-guide/index.js   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index b9ff56a956..262adb7092 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -24,6 +24,7 @@ import {
 	GUIDE_NAMES,
 	LOCAL_STORAGE_KEYS,
 	GOOGLE_ADS_ACCOUNT_STATUS,
+	CAMPAIGN_TYPE_PMAX,
 } from '.~/constants';
 import localStorage from '.~/utils/localStorage';
 import { getProductFeedUrl } from '.~/utils/urls';
@@ -140,6 +141,10 @@ const SubmissionSuccessGuide = () => {
 	const { data: campaigns } = useAdsCampaigns();
 	const { googleAdsAccount, hasFinishedResolution } = useGoogleAdsAccount();
 
+	const pmaxCampaigns = campaigns?.filter(
+		( { type } ) => type === CAMPAIGN_TYPE_PMAX
+	);
+
 	useEffect( () => {
 		recordGlaEvent( 'gla_modal_open', {
 			context: GUIDE_NAMES.SUBMISSION_SUCCESS,
@@ -156,18 +161,15 @@ const SubmissionSuccessGuide = () => {
 	// @todo: Review whether we need that function since we have moved the buttons to be per page now.
 	const renderFinish = useCallback( () => null, [] );
 
-	// @todo: Review condition to display EC tracking screen. How do we get paid campaigns?
 	const showEnhancedConversionTrackingScreen =
-		// campaigns?.length &&
+		pmaxCampaigns?.length &&
 		googleAdsAccount?.status === GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED &&
 		hasFinishedResolution;
 
-	// @todo: Review logic to display credits screen. How do we get the paid campaigns?
 	const showGoogleAdsCreditsScreen =
-		! campaigns?.length && hasFinishedResolution;
+		! pmaxCampaigns?.length && hasFinishedResolution;
 
 	if ( showEnhancedConversionTrackingScreen ) {
-		// Add conversion screen if ads setup is complete
 		PAGES[ ENHANCED_CONVERSION_TRACKING_SCREEN ] = {
 			image,
 			content: <EnhancedConversion />,

From 78b97fd4a914a9207559143048eda720ab91a9c3 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Thu, 15 Feb 2024 14:09:04 +0400
Subject: [PATCH 28/95] Fix race condition.

---
 js/src/product-feed/submission-success-guide/index.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index 262adb7092..1ca8245888 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -138,8 +138,9 @@ const PAGES = {
  * @fires gla_modal_open with `context: GUIDE_NAMES.SUBMISSION_SUCCESS`
  */
 const SubmissionSuccessGuide = () => {
-	const { data: campaigns } = useAdsCampaigns();
-	const { googleAdsAccount, hasFinishedResolution } = useGoogleAdsAccount();
+	const { data: campaigns, loaded: adsCampaignsLoaded } = useAdsCampaigns();
+	const { googleAdsAccount, hasFinishedResolution: googleAdsAccountLoaded } =
+		useGoogleAdsAccount();
 
 	const pmaxCampaigns = campaigns?.filter(
 		( { type } ) => type === CAMPAIGN_TYPE_PMAX
@@ -164,10 +165,11 @@ const SubmissionSuccessGuide = () => {
 	const showEnhancedConversionTrackingScreen =
 		pmaxCampaigns?.length &&
 		googleAdsAccount?.status === GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED &&
-		hasFinishedResolution;
+		googleAdsAccountLoaded &&
+		adsCampaignsLoaded;
 
 	const showGoogleAdsCreditsScreen =
-		! pmaxCampaigns?.length && hasFinishedResolution;
+		! pmaxCampaigns?.length && googleAdsAccountLoaded && adsCampaignsLoaded;
 
 	if ( showEnhancedConversionTrackingScreen ) {
 		PAGES[ ENHANCED_CONVERSION_TRACKING_SCREEN ] = {

From b85f7debf5f9a021a131e82c39ec55a22a860a8a Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Thu, 15 Feb 2024 14:27:21 +0400
Subject: [PATCH 29/95] Add more tests.

---
 .../cta/index.test.js                         | 40 +++++++++++++++++
 .../useAcceptedCustomerDataTerms.test.js      | 23 ++++++++++
 .../hooks/useAllowEnhancedConversions.test.js | 43 +++++++++++++++++++
 .../useAutoCheckEnhancedConversionTOS.js      |  2 +-
 4 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 js/src/hooks/useAcceptedCustomerDataTerms.test.js
 create mode 100644 js/src/hooks/useAllowEnhancedConversions.test.js

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
index a448e50d80..cac22610e5 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
@@ -20,10 +20,21 @@ jest.mock( '.~/hooks/useAutoCheckEnhancedConversionTOS', () => ( {
 	default: jest.fn().mockName( 'useAutoCheckEnhancedConversionTOS' ),
 } ) );
 
+jest.mock( '.~/data/actions', () => ( {
+	...jest.requireActual( '.~/data/actions' ),
+	updateEnhancedAdsConversionStatus: jest
+		.fn()
+		.mockName( 'updateEnhancedAdsConversionStatus' )
+		.mockImplementation( () => {
+			return { type: 'test', response: 'enabled' };
+		} ),
+} ) );
+
 /**
  * External dependencies
  */
 import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
 
 /**
@@ -35,6 +46,10 @@ import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import CTA from './index';
 
 describe( 'Enhanced Conversion CTA', () => {
+	beforeEach( () => {
+		jest.clearAllMocks();
+	} );
+
 	test( 'When not yet loaded, should render a loading spinner', () => {
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: false,
@@ -120,4 +135,29 @@ describe( 'Enhanced Conversion CTA', () => {
 		const spinner = screen.getByRole( 'status', { name: 'spinner' } );
 		expect( spinner ).toBeInTheDocument();
 	} );
+
+	test( 'Click on accept TOS button callback', () => {
+		const handleOnAcceptTerms = jest.fn().mockName( 'On TOS click' );
+
+		window.open = jest.fn();
+
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: false,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+
+		useAllowEnhancedConversions.mockReturnValue( {
+			allowEnhancedConversions: null,
+			isResolving: false,
+		} );
+
+		render( <CTA onAcceptTermsClick={ handleOnAcceptTerms } /> );
+
+		const button = screen.getByRole( 'button' );
+		userEvent.click( button );
+
+		expect( window.open ).toHaveBeenCalledTimes( 1 );
+		expect( handleOnAcceptTerms ).toHaveBeenCalledTimes( 1 );
+	} );
 } );
diff --git a/js/src/hooks/useAcceptedCustomerDataTerms.test.js b/js/src/hooks/useAcceptedCustomerDataTerms.test.js
new file mode 100644
index 0000000000..4b3d30820d
--- /dev/null
+++ b/js/src/hooks/useAcceptedCustomerDataTerms.test.js
@@ -0,0 +1,23 @@
+/**
+ * External dependencies
+ */
+import { renderHook } from '@testing-library/react-hooks';
+
+/**
+ * Internal dependencies
+ */
+import { useAppDispatch } from '.~/data';
+import useAcceptedCustomerDataTerms from './useAcceptedCustomerDataTerms';
+
+describe( 'useAcceptedCustomerDataTerms', () => {
+	it( 'Returns the correct status when set to true', () => {
+		const { result } = renderHook( () => {
+			const { receiveAcceptedTerms } = useAppDispatch();
+			receiveAcceptedTerms( { status: true } );
+
+			return useAcceptedCustomerDataTerms();
+		} );
+
+		expect( result.current.acceptedCustomerDataTerms ).toBeTruthy();
+	} );
+} );
diff --git a/js/src/hooks/useAllowEnhancedConversions.test.js b/js/src/hooks/useAllowEnhancedConversions.test.js
new file mode 100644
index 0000000000..11113a01ec
--- /dev/null
+++ b/js/src/hooks/useAllowEnhancedConversions.test.js
@@ -0,0 +1,43 @@
+/**
+ * External dependencies
+ */
+import { renderHook } from '@testing-library/react-hooks';
+
+/**
+ * Internal dependencies
+ */
+import { useAppDispatch } from '.~/data';
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
+import useAllowEnhancedConversions from './useAllowEnhancedConversions';
+
+describe( 'useAllowEnhancedConversions', () => {
+	it( 'Returns the correct status when enabled', () => {
+		const { result } = renderHook( () => {
+			const { receiveAllowEnhancedConversions } = useAppDispatch();
+			receiveAllowEnhancedConversions( {
+				status: ENHANCED_ADS_CONVERSION_STATUS.ENABLED,
+			} );
+
+			return useAllowEnhancedConversions();
+		} );
+
+		expect( result.current.allowEnhancedConversions ).toEqual(
+			ENHANCED_ADS_CONVERSION_STATUS.ENABLED
+		);
+	} );
+
+	it( 'Returns the correct status when disabled', () => {
+		const { result } = renderHook( () => {
+			const { receiveAllowEnhancedConversions } = useAppDispatch();
+			receiveAllowEnhancedConversions( {
+				status: ENHANCED_ADS_CONVERSION_STATUS.DISABLED,
+			} );
+
+			return useAllowEnhancedConversions();
+		} );
+
+		expect( result.current.allowEnhancedConversions ).toEqual(
+			ENHANCED_ADS_CONVERSION_STATUS.DISABLED
+		);
+	} );
+} );
diff --git a/js/src/hooks/useAutoCheckEnhancedConversionTOS.js b/js/src/hooks/useAutoCheckEnhancedConversionTOS.js
index b853849638..6ab285c1d1 100644
--- a/js/src/hooks/useAutoCheckEnhancedConversionTOS.js
+++ b/js/src/hooks/useAutoCheckEnhancedConversionTOS.js
@@ -1,10 +1,10 @@
 /**
  * External dependencies
  */
+import { noop } from 'lodash';
 import { __ } from '@wordpress/i18n';
 import { useCallback, useRef } from '@wordpress/element';
 import apiFetch from '@wordpress/api-fetch';
-import { noop } from 'lodash';
 
 /**
  * Internal dependencies

From 5af67a95638541aef8f509600939e9a95c72bd68 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Thu, 15 Feb 2024 15:45:49 +0400
Subject: [PATCH 30/95] Tests to enable/disable CTA.

---
 .../cta/index.test.js                         | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
index cac22610e5..85d8bd2003 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
@@ -160,4 +160,48 @@ describe( 'Enhanced Conversion CTA', () => {
 		expect( window.open ).toHaveBeenCalledTimes( 1 );
 		expect( handleOnAcceptTerms ).toHaveBeenCalledTimes( 1 );
 	} );
+
+	test( 'Click on enable/confirm button callback', () => {
+		const handleOnEnable = jest.fn().mockName( 'On Enable click' );
+
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: true,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+
+		useAllowEnhancedConversions.mockReturnValue( {
+			allowEnhancedConversions: null,
+			isResolving: false,
+		} );
+
+		render( <CTA onEnableClick={ handleOnEnable } /> );
+
+		const button = screen.getByRole( 'button' );
+		userEvent.click( button );
+
+		expect( handleOnEnable ).toHaveBeenCalledTimes( 1 );
+	} );
+
+	test( 'Click on disable button callback', () => {
+		const handleOnDisable = jest.fn().mockName( 'On Disable click' );
+
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: true,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+
+		useAllowEnhancedConversions.mockReturnValue( {
+			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.ENABLED,
+			isResolving: false,
+		} );
+
+		render( <CTA onDisableClick={ handleOnDisable } /> );
+
+		const button = screen.getByRole( 'button' );
+		userEvent.click( button );
+
+		expect( handleOnDisable ).toHaveBeenCalledTimes( 1 );
+	} );
 } );

From 07f16ff18ae97cff9d13ae2e806c79a3069b4e8e Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Thu, 15 Feb 2024 17:43:40 +0400
Subject: [PATCH 31/95] Add tests for submission guide.

---
 .../cta/index.js                              |  19 +---
 .../cta/index.test.js                         |  61 ++++++++++
 .../EnhancedConversion.test.js                |  52 +++++++++
 .../EnhancedConversionFooter.js               |   2 +-
 .../EnhancedConversionFooter.test.js          |  93 +++++++++++++++
 .../submission-success-guide/index.js         |   4 +
 .../submission-success-guide/index.test.js    | 107 ++++++++++++++++++
 7 files changed, 324 insertions(+), 14 deletions(-)
 create mode 100644 js/src/product-feed/submission-success-guide/EnhancedConversion.test.js
 create mode 100644 js/src/product-feed/submission-success-guide/EnhancedConversionFooter.test.js
 create mode 100644 js/src/product-feed/submission-success-guide/index.test.js

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
index d95d4e8b85..fd6ad6eea5 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
@@ -116,19 +116,12 @@ const CTA = ( {
 		);
 	}
 
-	// User has accepted TOS but has not enabled enhanced tracking.
-	if (
-		allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.DISABLED ||
-		acceptedCustomerDataTerms
-	) {
-		return (
-			<AppButton isPrimary onClick={ handleEnable }>
-				{ enableLabel }
-			</AppButton>
-		);
-	}
-
-	return null;
+	// User has accepted TOS or tracking is disabled.
+	return (
+		<AppButton isPrimary onClick={ handleEnable }>
+			{ enableLabel }
+		</AppButton>
+	);
 };
 
 export default CTA;
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
index 85d8bd2003..d03003960a 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
@@ -183,6 +183,28 @@ describe( 'Enhanced Conversion CTA', () => {
 		expect( handleOnEnable ).toHaveBeenCalledTimes( 1 );
 	} );
 
+	test( 'Confirm/enable button callback should not be called if TOS has not been accepted', () => {
+		const handleOnEnable = jest.fn().mockName( 'On Enable click' );
+
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: false,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+
+		useAllowEnhancedConversions.mockReturnValue( {
+			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.ENABLED,
+			isResolving: false,
+		} );
+
+		render( <CTA onEnableClick={ handleOnEnable } /> );
+
+		const button = screen.getByRole( 'button' );
+		userEvent.click( button );
+
+		expect( handleOnEnable ).not.toHaveBeenCalled();
+	} );
+
 	test( 'Click on disable button callback', () => {
 		const handleOnDisable = jest.fn().mockName( 'On Disable click' );
 
@@ -204,4 +226,43 @@ describe( 'Enhanced Conversion CTA', () => {
 
 		expect( handleOnDisable ).toHaveBeenCalledTimes( 1 );
 	} );
+
+	test( 'Disable button callback should not be called if TOS has not been accepted', () => {
+		const handleOnDisable = jest.fn().mockName( 'On Disable click' );
+
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: false,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+
+		useAllowEnhancedConversions.mockReturnValue( {
+			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.ENABLED,
+			isResolving: false,
+		} );
+
+		render( <CTA onDisableClick={ handleOnDisable } /> );
+
+		const button = screen.getByRole( 'button' );
+		userEvent.click( button );
+
+		expect( handleOnDisable ).not.toHaveBeenCalled();
+	} );
+
+	test( 'Should not the enable button if TOS has been accepted', () => {
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: true,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+
+		useAllowEnhancedConversions.mockReturnValue( {
+			allowEnhancedConversions: null,
+			isResolving: false,
+		} );
+
+		render( <CTA /> );
+
+		expect( screen.getByText( 'Enable' ) ).toBeInTheDocument();
+	} );
 } );
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversion.test.js b/js/src/product-feed/submission-success-guide/EnhancedConversion.test.js
new file mode 100644
index 0000000000..d56a1494bc
--- /dev/null
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversion.test.js
@@ -0,0 +1,52 @@
+jest.mock( '.~/hooks/useAcceptedCustomerDataTerms', () => ( {
+	__esModule: true,
+	default: jest.fn().mockName( 'useAcceptedCustomerDataTerms' ),
+} ) );
+
+/**
+ * External dependencies
+ */
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
+
+/**
+ * Internal dependencies
+ */
+import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+import EnhancedConversion from './EnhancedConversion';
+
+describe( 'Enhanced Conversion', () => {
+	beforeEach( () => {
+		jest.clearAllMocks();
+	} );
+
+	test( 'Render the correct text when TOS has not been accepted', () => {
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: false,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+
+		render( <EnhancedConversion /> );
+		expect(
+			screen.getByText(
+				'Activating it is easy – just agree to the terms of service on Google Ads and we will make the tagging changes needed for you. This feature can also be managed from Google Listings & Ads > Settings'
+			)
+		).toBeInTheDocument();
+	} );
+
+	test( 'Render the correct text when TOS has been accepted', () => {
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: true,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+
+		render( <EnhancedConversion /> );
+		expect(
+			screen.getByText(
+				'Clicking confirm will enable Enhanced Conversions on your account and update your tags accordingly. This feature can also be managed from Google Listings & Ads > Settings'
+			)
+		).toBeInTheDocument();
+	} );
+} );
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
index 47a7c3ea8b..5cef09dd4a 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
@@ -17,7 +17,7 @@ const EnhancedConversionFooter = ( { handleGuideFinish } ) => {
 	const handleEnableOrDisableClick = useCallback( () => {
 		createNotice(
 			'info',
-			__( 'Status succesfully set', 'google-listings-and-ads' )
+			__( 'Status successfully set', 'google-listings-and-ads' )
 		);
 
 		handleGuideFinish?.();
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.test.js b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.test.js
new file mode 100644
index 0000000000..dd047f716b
--- /dev/null
+++ b/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.test.js
@@ -0,0 +1,93 @@
+jest.mock( '.~/hooks/useAcceptedCustomerDataTerms', () => ( {
+	__esModule: true,
+	default: jest.fn().mockName( 'useAcceptedCustomerDataTerms' ),
+} ) );
+
+jest.mock( '.~/hooks/useAllowEnhancedConversions', () => ( {
+	__esModule: true,
+	default: jest.fn().mockName( 'useAllowEnhancedConversions' ),
+} ) );
+
+jest.mock( '.~/hooks/useDispatchCoreNotices', () => ( {
+	__esModule: true,
+	default: jest
+		.fn()
+		.mockName( 'useDispatchCoreNotices' )
+		.mockImplementation( () => {
+			return {
+				createNotice: jest.fn(),
+			};
+		} ),
+} ) );
+
+jest.mock( '.~/data/actions', () => ( {
+	...jest.requireActual( '.~/data/actions' ),
+	updateEnhancedAdsConversionStatus: jest
+		.fn()
+		.mockName( 'updateEnhancedAdsConversionStatus' )
+		.mockImplementation( () => {
+			return { type: 'test', response: 'enabled' };
+		} ),
+} ) );
+
+/**
+ * External dependencies
+ */
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import '@testing-library/jest-dom';
+
+/**
+ * Internal dependencies
+ */
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
+import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
+import EnhancedConversionFooter from './EnhancedConversionFooter';
+
+describe( 'Enhanced Conversion Footer', () => {
+	beforeEach( () => {
+		jest.clearAllMocks();
+	} );
+
+	test( 'Prompt the user to accept the TOS', () => {
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: false,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+		useAllowEnhancedConversions.mockReturnValue( {
+			allowEnhancedConversions: null,
+			isResolving: false,
+		} );
+
+		render( <EnhancedConversionFooter /> );
+
+		expect(
+			screen.getByText( 'Sign terms of service on Google Ads' )
+		).toBeInTheDocument();
+	} );
+
+	test( 'Click on enable/disable button callback', () => {
+		const handleGuideFinish = jest.fn().mockName( 'On button click' );
+
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: true,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+		useAllowEnhancedConversions.mockReturnValue( {
+			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.DISABLED,
+			isResolving: false,
+		} );
+
+		render(
+			<EnhancedConversionFooter handleGuideFinish={ handleGuideFinish } />
+		);
+
+		const button = screen.getByRole( 'button', { name: 'Confirm' } );
+		userEvent.click( button );
+
+		expect( handleGuideFinish ).toHaveBeenCalledTimes( 1 );
+	} );
+} );
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index 1ca8245888..1a89522eff 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -172,6 +172,8 @@ const SubmissionSuccessGuide = () => {
 		! pmaxCampaigns?.length && googleAdsAccountLoaded && adsCampaignsLoaded;
 
 	if ( showEnhancedConversionTrackingScreen ) {
+		delete PAGES[ GOOGLE_ADS_CREDITS_SCREEN ];
+
 		PAGES[ ENHANCED_CONVERSION_TRACKING_SCREEN ] = {
 			image,
 			content: <EnhancedConversion />,
@@ -182,6 +184,8 @@ const SubmissionSuccessGuide = () => {
 			),
 		};
 	} else if ( showGoogleAdsCreditsScreen ) {
+		delete PAGES[ ENHANCED_CONVERSION_TRACKING_SCREEN ];
+
 		// There are no campaigns, add Google Ads credit screen
 		PAGES[ GOOGLE_ADS_CREDITS_SCREEN ] = {
 			image,
diff --git a/js/src/product-feed/submission-success-guide/index.test.js b/js/src/product-feed/submission-success-guide/index.test.js
new file mode 100644
index 0000000000..4472621bd8
--- /dev/null
+++ b/js/src/product-feed/submission-success-guide/index.test.js
@@ -0,0 +1,107 @@
+jest.mock( '.~/hooks/useAdsCampaigns', () =>
+	jest.fn().mockName( 'useAdsCampaigns' )
+);
+
+jest.mock( '.~/hooks/useGoogleAdsAccount', () =>
+	jest.fn().mockName( 'useGoogleAdsAccount' ).mockReturnValue( {} )
+);
+
+jest.mock( '.~/hooks/useDispatchCoreNotices', () => ( {
+	__esModule: true,
+	default: jest
+		.fn()
+		.mockName( 'useDispatchCoreNotices' )
+		.mockImplementation( () => {
+			return {
+				createNotice: jest.fn(),
+			};
+		} ),
+} ) );
+
+/**
+ * External dependencies
+ */
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import '@testing-library/jest-dom';
+
+/**
+ * Internal dependencies
+ */
+import SubmissionSuccessGuide from './index';
+import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
+import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
+import { CAMPAIGN_TYPE_PMAX } from '.~/constants';
+
+const CONNECTED_ADS_ACCOUNT = {
+	id: 777777,
+	currency: 'PLN',
+	symbol: 'zł',
+	status: 'connected',
+};
+
+const PAID_CAMPAIGN = {
+	id: 10,
+	name: 'PMax Campaign',
+	status: 'enabled',
+	type: CAMPAIGN_TYPE_PMAX,
+	amount: 20,
+	displayCountries: [ 'US' ],
+};
+
+const FREE_CAMPAIGN = {
+	id: 11,
+	name: 'Free Campaign',
+	status: 'enabled',
+	type: 'shopping',
+	amount: 30,
+	displayCountries: [ 'US' ],
+};
+
+describe( 'SubmissionSuccessGuide', () => {
+	beforeEach( () => {
+		jest.clearAllMocks();
+	} );
+
+	test( 'Renders the Google Ads credit screen if there are no paid campaigns', () => {
+		useGoogleAdsAccount.mockReturnValue( {
+			googleAdsAccount: CONNECTED_ADS_ACCOUNT,
+			hasFinishedResolution: true,
+		} );
+
+		useAdsCampaigns.mockReturnValue( {
+			data: [ FREE_CAMPAIGN ],
+			loaded: true,
+		} );
+
+		render( <SubmissionSuccessGuide /> );
+
+		const button = screen.getByRole( 'button', { name: 'Next' } );
+		userEvent.click( button );
+
+		expect(
+			screen.getByText( 'Spend $500 to get $500 in Google Ads credits' )
+		).toBeInTheDocument();
+	} );
+
+	test( 'Renders the enhanced tracking screen if there are paid campaigns', () => {
+		useGoogleAdsAccount.mockReturnValue( {
+			googleAdsAccount: CONNECTED_ADS_ACCOUNT,
+			hasFinishedResolution: true,
+		} );
+
+		useAdsCampaigns.mockReturnValue( {
+			data: [ PAID_CAMPAIGN ],
+			loaded: true,
+		} );
+
+		render( <SubmissionSuccessGuide /> );
+
+		const button = screen.getByRole( 'button', { name: 'Next' } );
+		userEvent.click( button );
+
+		expect(
+			screen.getByText( 'Enhanced Conversion Tracking' )
+		).toBeInTheDocument();
+	} );
+} );

From 3302f7edead2bd28e0520c2826c2d5cf7d2cf3dc Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Thu, 15 Feb 2024 20:38:56 +0530
Subject: [PATCH 32/95] Add user data on purchase page for enhanced conversion

---
 src/Google/GlobalSiteTag.php | 60 +++++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/src/Google/GlobalSiteTag.php b/src/Google/GlobalSiteTag.php
index 39d20c70e4..2f99c487a2 100644
--- a/src/Google/GlobalSiteTag.php
+++ b/src/Google/GlobalSiteTag.php
@@ -24,6 +24,7 @@
 use Automattic\WooCommerce\GoogleListingsAndAds\Proxies\WP;
 use Automattic\WooCommerce\GoogleListingsAndAds\Value\BuiltScriptDependencyArray;
 use WC_Product;
+use WC_Customer;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -274,7 +275,7 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 		$order = wc_get_order( $order_id );
 		// Make sure there is a valid order object and it is not already marked as tracked
 		if ( ! $order || 1 === $order->get_meta( self::ORDER_CONVERSION_META_KEY, true ) ) {
-			return;
+			//return;
 		}
 
 		// Mark the order as tracked, to avoid double-reporting if the confirmation page is reloaded.
@@ -355,6 +356,63 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 			join( ',', $item_info ),
 		);
 		wp_print_inline_script_tag( $purchase_page_gtag );
+
+		// Enhanced conversion data.
+		$ec_data         = [];
+		$customer        = new WC_Customer( $order->get_customer_id() );
+		$email           = $customer->get_billing_email();
+		$fname           = $customer->get_billing_first_name();
+		$lname           = $customer->get_billing_last_name();
+		$phone           = $customer->get_billing_phone();
+		$billing_address = $customer->get_billing_address();
+		$postcode        = $customer->get_billing_postcode();
+		$city            = $customer->get_billing_city();
+		$region          = $customer->get_billing_state();
+		$country         = $customer->get_billing_country();
+
+		// Add email in EC data.
+		if ( ! empty( $email ) ) {
+			$ec_data['email'] = $email;
+		}
+
+		// Format phone number in IE64.
+		$phone 		  = preg_replace( '/[^0-9]/', '', $phone );
+		$phone_length = strlen( $phone );
+		if ( $phone_length > 9 && $phone_length < 14 ) {
+			$phone            = sprintf( '%s%d', '+', $phone );
+			$ec_data['email'] = $email;
+		}
+
+		// Check for required address fields.
+		if ( ! empty( $fname ) && ! empty( $lname ) && ! empty( $postcode ) && ! empty( $country ) ) {
+			$ec_data['address']['first_name']  = $fname;
+			$ec_data['address']['last_name']   = $lname;
+			$ec_data['address']['postal_code'] = $postcode;
+			$ec_data['address']['country']     = $country;
+
+			/**
+			 * Add additional data, if present.
+			 */
+
+			// Add street address.
+			if ( ! empty( $billing_address ) ) {
+				$ec_data['address']['street'] = $billing_address;
+			}
+
+			// Add city.
+			if ( ! empty( $city ) ) {
+				$ec_data['address']['city'] = $city;
+			}
+
+			// Add region.
+			if ( ! empty( $region ) ) {
+				$ec_data['address']['region'] = $region;
+			}
+		}
+
+		$purchase_user_data_gtag = sprintf( 'gtag("set", "user_data", %s)', wp_json_encode( $ec_data ) );
+
+		wp_print_inline_script_tag( $purchase_user_data_gtag );
 	}
 
 	/**

From 26c0a654c4576f54c007966ca2864d00ddfc6a46 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Thu, 15 Feb 2024 20:55:16 +0530
Subject: [PATCH 33/95] Fix: phpcs issues

---
 src/Google/GlobalSiteTag.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Google/GlobalSiteTag.php b/src/Google/GlobalSiteTag.php
index 2f99c487a2..c2ca6ac655 100644
--- a/src/Google/GlobalSiteTag.php
+++ b/src/Google/GlobalSiteTag.php
@@ -275,7 +275,7 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 		$order = wc_get_order( $order_id );
 		// Make sure there is a valid order object and it is not already marked as tracked
 		if ( ! $order || 1 === $order->get_meta( self::ORDER_CONVERSION_META_KEY, true ) ) {
-			//return;
+			return;
 		}
 
 		// Mark the order as tracked, to avoid double-reporting if the confirmation page is reloaded.
@@ -376,7 +376,7 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 		}
 
 		// Format phone number in IE64.
-		$phone 		  = preg_replace( '/[^0-9]/', '', $phone );
+		$phone        = preg_replace( '/[^0-9]/', '', $phone );
 		$phone_length = strlen( $phone );
 		if ( $phone_length > 9 && $phone_length < 14 ) {
 			$phone            = sprintf( '%s%d', '+', $phone );

From d61382584f39b2d0fe3efd713cf64a3c56487bf0 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Thu, 15 Feb 2024 23:44:32 +0530
Subject: [PATCH 34/95] revert tag changes

---
 src/Google/GlobalSiteTag.php | 90 ++----------------------------------
 1 file changed, 5 insertions(+), 85 deletions(-)

diff --git a/src/Google/GlobalSiteTag.php b/src/Google/GlobalSiteTag.php
index c2ca6ac655..c3348242c5 100644
--- a/src/Google/GlobalSiteTag.php
+++ b/src/Google/GlobalSiteTag.php
@@ -24,7 +24,6 @@
 use Automattic\WooCommerce\GoogleListingsAndAds\Proxies\WP;
 use Automattic\WooCommerce\GoogleListingsAndAds\Value\BuiltScriptDependencyArray;
 use WC_Product;
-use WC_Customer;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -221,10 +220,9 @@ public function activate_global_site_tag( string $ads_conversion_id ) {
 			add_filter(
 				'woocommerce_gtag_snippet',
 				function ( $gtag_snippet ) use ( $ads_conversion_id ) {
-					$config = wp_json_encode( $this->get_config_object() );
 					return preg_replace(
 						'~(\s)</script>~',
-						"\tgtag('config', '" . $ads_conversion_id . "', $config);\n$1</script>",
+						"\tgtag('config', '" . $ads_conversion_id . "', { 'groups': 'GLA', 'send_page_view': false });\n$1</script>",
 						$gtag_snippet
 					);
 				}
@@ -240,7 +238,6 @@ function ( $gtag_snippet ) use ( $ads_conversion_id ) {
 	 * @param string $ads_conversion_id Google Ads account conversion ID.
 	 */
 	protected function display_global_site_tag( string $ads_conversion_id ) {
-		$config = $this->get_config_object();
 		// phpcs:disable WordPress.WP.EnqueuedResources.NonEnqueuedScript
 		?>
 
@@ -252,7 +249,10 @@ function gtag() { dataLayer.push(arguments); }
 
 			gtag('js', new Date());
 			gtag('set', 'developer_id.<?php echo esc_js( self::DEVELOPER_ID ); ?>', true);
-			gtag('config', '<?php echo esc_js( $ads_conversion_id ); ?>', <?php echo wp_json_encode( $config ); // phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped ?>);
+			gtag('config', '<?php echo esc_js( $ads_conversion_id ); ?>', {
+				'groups': 'GLA',
+				'send_page_view': false
+			});
 		</script>
 
 		<?php
@@ -356,63 +356,6 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 			join( ',', $item_info ),
 		);
 		wp_print_inline_script_tag( $purchase_page_gtag );
-
-		// Enhanced conversion data.
-		$ec_data         = [];
-		$customer        = new WC_Customer( $order->get_customer_id() );
-		$email           = $customer->get_billing_email();
-		$fname           = $customer->get_billing_first_name();
-		$lname           = $customer->get_billing_last_name();
-		$phone           = $customer->get_billing_phone();
-		$billing_address = $customer->get_billing_address();
-		$postcode        = $customer->get_billing_postcode();
-		$city            = $customer->get_billing_city();
-		$region          = $customer->get_billing_state();
-		$country         = $customer->get_billing_country();
-
-		// Add email in EC data.
-		if ( ! empty( $email ) ) {
-			$ec_data['email'] = $email;
-		}
-
-		// Format phone number in IE64.
-		$phone        = preg_replace( '/[^0-9]/', '', $phone );
-		$phone_length = strlen( $phone );
-		if ( $phone_length > 9 && $phone_length < 14 ) {
-			$phone            = sprintf( '%s%d', '+', $phone );
-			$ec_data['email'] = $email;
-		}
-
-		// Check for required address fields.
-		if ( ! empty( $fname ) && ! empty( $lname ) && ! empty( $postcode ) && ! empty( $country ) ) {
-			$ec_data['address']['first_name']  = $fname;
-			$ec_data['address']['last_name']   = $lname;
-			$ec_data['address']['postal_code'] = $postcode;
-			$ec_data['address']['country']     = $country;
-
-			/**
-			 * Add additional data, if present.
-			 */
-
-			// Add street address.
-			if ( ! empty( $billing_address ) ) {
-				$ec_data['address']['street'] = $billing_address;
-			}
-
-			// Add city.
-			if ( ! empty( $city ) ) {
-				$ec_data['address']['city'] = $city;
-			}
-
-			// Add region.
-			if ( ! empty( $region ) ) {
-				$ec_data['address']['region'] = $region;
-			}
-		}
-
-		$purchase_user_data_gtag = sprintf( 'gtag("set", "user_data", %s)', wp_json_encode( $ec_data ) );
-
-		wp_print_inline_script_tag( $purchase_user_data_gtag );
 	}
 
 	/**
@@ -578,27 +521,4 @@ private function register_js_for_fast_refresh_dev() {
 			false
 		);
 	}
-
-	/**
-	 * Get the config object for Google tag.
-	 *
-	 * @return array
-	 */
-	private function get_config_object() {
-		// Standard config.
-		$config = [
-			'groups'         => 'GLA',
-			'send_page_view' => false,
-		];
-
-		// Check if enhanced conversion is enabled.
-		$enhanced_conversion_status  = $this->options->get( OptionsInterface::ENHANCED_CONVERSION_STATUS, null );
-		$enhanced_conversion_enabled = ( 'enabled' === $enhanced_conversion_status );
-
-		if ( $enhanced_conversion_enabled ) {
-			$config['allow_enhanced_conversions'] = true;
-		}
-
-		return $config;
-	}
 }

From 783229f3fff06de9156a606cc7159e1862f5bc40 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Fri, 16 Feb 2024 23:08:42 +0530
Subject: [PATCH 35/95] Option to store data terms in options table

---
 src/API/Google/Ads.php           | 15 ++++++++++++++-
 src/Ads/AccountService.php       |  1 +
 src/Options/OptionsInterface.php |  2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index 90f0ff19cf..8448361ef0 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -335,6 +335,13 @@ public function get_accepted_customer_data_terms(): ?bool {
 		$ads_id = $this->options->get_ads_id();
 
 		try {
+			$accepted_terms = $this->options->get( OptionsInterface::CUSTOMER_DATA_TERMS, null );
+
+			// Retrieve the terms acceptance data from options.
+			if ( null !== $accepted_terms ) {
+				return $accepted_terms;
+			}
+
 			$customer = ( new AdsAccountQuery() )
 				->set_client( $this->client, $ads_id )
 				->columns( [ 'customer.conversion_tracking_setting.accepted_customer_data_terms' ] )
@@ -347,7 +354,13 @@ public function get_accepted_customer_data_terms(): ?bool {
 
 			$conversion_tracking_setting = $customer->getConversionTrackingSetting();
 
-			return $conversion_tracking_setting->getAcceptedCustomerDataTerms();
+			$accepted = $conversion_tracking_setting->getAcceptedCustomerDataTerms();
+			$status   = $accepted ? 1 : 0;
+
+			// Save the data terms in options as those cannot be reverted.
+			$this->options->update( OptionsInterface::CUSTOMER_DATA_TERMS, $status );
+
+			return $accepted;
 		} catch ( ApiException $e ) {
 			do_action( 'woocommerce_gla_ads_client_exception', $e, __METHOD__ );
 		}
diff --git a/src/Ads/AccountService.php b/src/Ads/AccountService.php
index d809868635..c9ef7a1510 100644
--- a/src/Ads/AccountService.php
+++ b/src/Ads/AccountService.php
@@ -218,6 +218,7 @@ public function disconnect() {
 		$this->options->delete( OptionsInterface::ADS_ID );
 		$this->options->delete( OptionsInterface::ADS_SETUP_COMPLETED_AT );
 		$this->options->delete( OptionsInterface::CAMPAIGN_CONVERT_STATUS );
+		$this->options->delete( OptionsInterface::CUSTOMER_DATA_TERMS );
 		$this->container->get( TransientsInterface::class )->delete( TransientsInterface::ADS_CAMPAIGN_COUNT );
 	}
 
diff --git a/src/Options/OptionsInterface.php b/src/Options/OptionsInterface.php
index 86d6e4fce4..9b7b03c78f 100644
--- a/src/Options/OptionsInterface.php
+++ b/src/Options/OptionsInterface.php
@@ -42,6 +42,7 @@ interface OptionsInterface {
 	public const TOURS                                     = 'tours';
 	public const UPDATE_ALL_PRODUCTS_LAST_SYNC             = 'update_all_products_last_sync';
 	public const WP_TOS_ACCEPTED                           = 'wp_tos_accepted';
+	public const CUSTOMER_DATA_TERMS                       = 'customer_data_terms';
 
 	public const VALID_OPTIONS = [
 		self::ADS_ACCOUNT_CURRENCY                      => true,
@@ -74,6 +75,7 @@ interface OptionsInterface {
 		self::TOURS                                     => true,
 		self::UPDATE_ALL_PRODUCTS_LAST_SYNC             => true,
 		self::WP_TOS_ACCEPTED                           => true,
+		self::CUSTOMER_DATA_TERMS                       => true,
 	];
 
 	public const OPTION_TYPES = [

From e180b484dd5d429abed0758b2b49d0a27973170c Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Fri, 16 Feb 2024 23:18:50 +0530
Subject: [PATCH 36/95] Fix: test for deleting option

---
 tests/Unit/Ads/AccountServiceTest.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/Unit/Ads/AccountServiceTest.php b/tests/Unit/Ads/AccountServiceTest.php
index 8fc93eeda0..68e584779c 100644
--- a/tests/Unit/Ads/AccountServiceTest.php
+++ b/tests/Unit/Ads/AccountServiceTest.php
@@ -461,7 +461,7 @@ public function test_get_billing_status_pending() {
 	}
 
 	public function test_disconnect() {
-		$this->options->expects( $this->exactly( 7 ) )
+		$this->options->expects( $this->exactly( 8 ) )
 			->method( 'delete' )
 			->withConsecutive(
 				[ OptionsInterface::ADS_ACCOUNT_CURRENCY ],
@@ -470,7 +470,8 @@ public function test_disconnect() {
 				[ OptionsInterface::ADS_CONVERSION_ACTION ],
 				[ OptionsInterface::ADS_ID ],
 				[ OptionsInterface::ADS_SETUP_COMPLETED_AT ],
-				[ OptionsInterface::CAMPAIGN_CONVERT_STATUS ]
+				[ OptionsInterface::CAMPAIGN_CONVERT_STATUS ],
+				[ OptionsInterface::CUSTOMER_DATA_TERMS ]
 			);
 
 		$this->transients->expects( $this->exactly( 1 ) )

From 672800eb73a1149d6b1710c23cf45bca9066ce9a Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Fri, 16 Feb 2024 23:20:10 +0530
Subject: [PATCH 37/95] Update src/Google/GlobalSiteTag.php

Update phone number

Co-authored-by: Joe McGill <801097+joemcgill@users.noreply.github.com>
---
 src/Google/GlobalSiteTag.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Google/GlobalSiteTag.php b/src/Google/GlobalSiteTag.php
index c2ca6ac655..2f961a104c 100644
--- a/src/Google/GlobalSiteTag.php
+++ b/src/Google/GlobalSiteTag.php
@@ -380,7 +380,7 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 		$phone_length = strlen( $phone );
 		if ( $phone_length > 9 && $phone_length < 14 ) {
 			$phone            = sprintf( '%s%d', '+', $phone );
-			$ec_data['email'] = $email;
+			$ec_data['phone_number'] = $phone;
 		}
 
 		// Check for required address fields.

From e3cf0050a0d8b976367f84517b98db657885235a Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Fri, 16 Feb 2024 23:48:01 +0530
Subject: [PATCH 38/95] E2E: Enhanced conversion user data test

---
 tests/e2e/specs/gtag-events/gtag-events.test.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/e2e/specs/gtag-events/gtag-events.test.js b/tests/e2e/specs/gtag-events/gtag-events.test.js
index c6a9030e87..8a46b9bddc 100644
--- a/tests/e2e/specs/gtag-events/gtag-events.test.js
+++ b/tests/e2e/specs/gtag-events/gtag-events.test.js
@@ -192,4 +192,18 @@ test.describe( 'GTag events', () => {
 			expect( data.country ).toEqual( 'US' );
 		} );
 	} );
+
+	test( 'User data for enhanced conversion event is sent on order complete page', async ( {
+		page,
+	} ) => {
+		await singleProductAddToCart( page, simpleProductID );
+
+		const event = trackGtagEvent( page, 'user_data', 'checkout' );
+		await checkout( page );
+
+		await event.then( ( request ) => {
+			const data = getEventData( request );
+			expect( data.email ).toEqual( 'john.doe@example.com' );
+		} );
+	} );
 } );

From 4d538893bdbaac53706f8a92fbdcc93b04fb9bb5 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 20 Feb 2024 14:23:29 +0400
Subject: [PATCH 39/95] Rename folders to be consistent with codebase.
 Individual screens have their own files now.

---
 .../wordpress/guide/index.js                  |   4 +-
 .../submission-success-guide/constants.js     |   1 +
 .../dynamic-screen-content.js                 |  48 +++++
 .../dynamic-screen-footer.js                  |  44 ++++
 .../footer.js}                                |  28 +--
 .../footer.test.js}                           |   8 +-
 .../index.js}                                 |   0
 .../index.test.js}                            |   2 +-
 .../google-credits/footer.js                  |  44 ++++
 .../google-credits/index.js                   |  48 +++++
 .../submission-success-guide/index.js         | 202 +++---------------
 .../submission-success-guide/index.scss       |   4 +
 .../setup-success/footer.js                   |  28 +++
 .../setup-success/index.js                    |  55 +++++
 14 files changed, 316 insertions(+), 200 deletions(-)
 create mode 100644 js/src/product-feed/submission-success-guide/constants.js
 create mode 100644 js/src/product-feed/submission-success-guide/dynamic-screen-content.js
 create mode 100644 js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
 rename js/src/product-feed/submission-success-guide/{EnhancedConversionFooter.js => enhanced-conversion/footer.js} (87%)
 rename js/src/product-feed/submission-success-guide/{EnhancedConversionFooter.test.js => enhanced-conversion/footer.test.js} (92%)
 rename js/src/product-feed/submission-success-guide/{EnhancedConversion.js => enhanced-conversion/index.js} (100%)
 rename js/src/product-feed/submission-success-guide/{EnhancedConversion.test.js => enhanced-conversion/index.test.js} (96%)
 create mode 100644 js/src/product-feed/submission-success-guide/google-credits/footer.js
 create mode 100644 js/src/product-feed/submission-success-guide/google-credits/index.js
 create mode 100644 js/src/product-feed/submission-success-guide/setup-success/footer.js
 create mode 100644 js/src/product-feed/submission-success-guide/setup-success/index.js

diff --git a/js/src/external-components/wordpress/guide/index.js b/js/src/external-components/wordpress/guide/index.js
index fd7d805d25..5976146ae7 100644
--- a/js/src/external-components/wordpress/guide/index.js
+++ b/js/src/external-components/wordpress/guide/index.js
@@ -136,8 +136,6 @@ export default function Guide( {
 						</Button>
 					) }
 
-					{ pages[ currentPage ]?.footer }
-
 					{ canGoForward && (
 						<Button
 							className="components-guide__forward-button"
@@ -148,6 +146,8 @@ export default function Guide( {
 					) }
 
 					{ finishBlock }
+
+					{ pages[ currentPage ]?.footer }
 				</div>
 			</div>
 		</Modal>
diff --git a/js/src/product-feed/submission-success-guide/constants.js b/js/src/product-feed/submission-success-guide/constants.js
new file mode 100644
index 0000000000..a99859cb82
--- /dev/null
+++ b/js/src/product-feed/submission-success-guide/constants.js
@@ -0,0 +1 @@
+export const EVENT_NAME = 'gla_modal_closed';
diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-content.js b/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
new file mode 100644
index 0000000000..e23ea6ab62
--- /dev/null
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
@@ -0,0 +1,48 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { GOOGLE_ADS_ACCOUNT_STATUS, CAMPAIGN_TYPE_PMAX } from '.~/constants';
+import LoadingLabel from '.~/components/loading-label';
+import GuidePageContent from '.~/components/guide-page-content';
+import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
+import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
+import EnhancedConversion from './enhanced-conversion';
+import GoogleCredits from './google-credits';
+
+const DynamicScreenContent = () => {
+	const { data: campaigns, loading: adsCampaignsLoading } = useAdsCampaigns();
+	const { googleAdsAccount, isResolving: googleAdsAccountLoading } =
+		useGoogleAdsAccount();
+
+	const pmaxCampaigns = campaigns?.filter(
+		( { type } ) => type === CAMPAIGN_TYPE_PMAX
+	);
+
+	if ( adsCampaignsLoading || googleAdsAccountLoading ) {
+		return (
+			<GuidePageContent
+				title={ __( 'Please wait', 'google-listings-and-ads' ) }
+			>
+				<div className="screen-content--loading">
+					<LoadingLabel />
+				</div>
+			</GuidePageContent>
+		);
+	}
+
+	if (
+		pmaxCampaigns?.length &&
+		googleAdsAccount?.status === GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED
+	) {
+		return <EnhancedConversion />;
+	}
+
+	return <GoogleCredits />;
+};
+
+export default DynamicScreenContent;
diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js b/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
new file mode 100644
index 0000000000..68a01696d3
--- /dev/null
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
@@ -0,0 +1,44 @@
+/**
+ * External dependencies
+ */
+import { Fragment } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { GOOGLE_ADS_ACCOUNT_STATUS, CAMPAIGN_TYPE_PMAX } from '.~/constants';
+import LoadingLabel from '.~/components/loading-label';
+import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
+import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
+import EnhancedConversionFooter from './enhanced-conversion/footer';
+import GoogleCreditsFooter from './google-credits/footer';
+
+const DynamicScreenFooter = ( { handleGuideFinish } ) => {
+	const { data: campaigns, loading: adsCampaignsLoading } = useAdsCampaigns();
+	const { googleAdsAccount, isResolving: googleAdsAccountLoading } =
+		useGoogleAdsAccount();
+
+	const pmaxCampaigns = campaigns?.filter(
+		( { type } ) => type === CAMPAIGN_TYPE_PMAX
+	);
+
+	if ( adsCampaignsLoading || googleAdsAccountLoading ) {
+		return (
+			<Fragment>
+				<div className="gla-submission-success-guide__space_holder" />
+				<LoadingLabel />
+			</Fragment>
+		);
+	}
+
+	if (
+		pmaxCampaigns?.length &&
+		googleAdsAccount?.status === GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED
+	) {
+		return <EnhancedConversionFooter />;
+	}
+
+	return <GoogleCreditsFooter handleGuideFinish={ handleGuideFinish } />;
+};
+
+export default DynamicScreenFooter;
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.js
similarity index 87%
rename from js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
rename to js/src/product-feed/submission-success-guide/enhanced-conversion/footer.js
index 5cef09dd4a..504347191c 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useCallback } from '@wordpress/element';
+import { useCallback, Fragment } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -11,7 +11,7 @@ import useDispatchCoreNotices from '.~/hooks/useDispatchCoreNotices';
 import AppButton from '.~/components/app-button';
 import CTA from '.~/components/enhanced-conversion-tracking-settings/cta';
 
-const EnhancedConversionFooter = ( { handleGuideFinish } ) => {
+const Footer = ( { handleGuideFinish } ) => {
 	const { createNotice } = useDispatchCoreNotices();
 
 	const handleEnableOrDisableClick = useCallback( () => {
@@ -24,9 +24,18 @@ const EnhancedConversionFooter = ( { handleGuideFinish } ) => {
 	}, [ createNotice, handleGuideFinish ] );
 
 	return (
-		<>
+		<Fragment>
 			<div className="gla-submission-success-guide__space_holder" />
 
+			<AppButton
+				isSecondary
+				// @todo: review data-action label
+				data-action="view-product-feed"
+				onClick={ handleGuideFinish }
+			>
+				{ __( 'Close', 'google-listings-and-ads' ) }
+			</AppButton>
+
 			<CTA
 				onEnableClick={ handleEnableOrDisableClick }
 				onDisableClick={ handleEnableOrDisableClick }
@@ -36,17 +45,8 @@ const EnhancedConversionFooter = ( { handleGuideFinish } ) => {
 				) }
 				enableLabel={ __( 'Confirm', 'google-listings-and-ads' ) }
 			/>
-
-			<AppButton
-				isSecondary
-				// @todo: review data-action label
-				data-action="view-product-feed"
-				onClick={ handleGuideFinish }
-			>
-				{ __( 'Close', 'google-listings-and-ads' ) }
-			</AppButton>
-		</>
+		</Fragment>
 	);
 };
 
-export default EnhancedConversionFooter;
+export default Footer;
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.test.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
similarity index 92%
rename from js/src/product-feed/submission-success-guide/EnhancedConversionFooter.test.js
rename to js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
index dd047f716b..c25285b7de 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversionFooter.test.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
@@ -43,7 +43,7 @@ import '@testing-library/jest-dom';
 import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
-import EnhancedConversionFooter from './EnhancedConversionFooter';
+import Footer from './footer';
 
 describe( 'Enhanced Conversion Footer', () => {
 	beforeEach( () => {
@@ -61,7 +61,7 @@ describe( 'Enhanced Conversion Footer', () => {
 			isResolving: false,
 		} );
 
-		render( <EnhancedConversionFooter /> );
+		render( <Footer /> );
 
 		expect(
 			screen.getByText( 'Sign terms of service on Google Ads' )
@@ -81,9 +81,7 @@ describe( 'Enhanced Conversion Footer', () => {
 			isResolving: false,
 		} );
 
-		render(
-			<EnhancedConversionFooter handleGuideFinish={ handleGuideFinish } />
-		);
+		render( <Footer handleGuideFinish={ handleGuideFinish } /> );
 
 		const button = screen.getByRole( 'button', { name: 'Confirm' } );
 		userEvent.click( button );
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversion.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
similarity index 100%
rename from js/src/product-feed/submission-success-guide/EnhancedConversion.js
rename to js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
diff --git a/js/src/product-feed/submission-success-guide/EnhancedConversion.test.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.test.js
similarity index 96%
rename from js/src/product-feed/submission-success-guide/EnhancedConversion.test.js
rename to js/src/product-feed/submission-success-guide/enhanced-conversion/index.test.js
index d56a1494bc..9f0fcb845e 100644
--- a/js/src/product-feed/submission-success-guide/EnhancedConversion.test.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.test.js
@@ -13,7 +13,7 @@ import '@testing-library/jest-dom';
  * Internal dependencies
  */
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
-import EnhancedConversion from './EnhancedConversion';
+import EnhancedConversion from './index';
 
 describe( 'Enhanced Conversion', () => {
 	beforeEach( () => {
diff --git a/js/src/product-feed/submission-success-guide/google-credits/footer.js b/js/src/product-feed/submission-success-guide/google-credits/footer.js
new file mode 100644
index 0000000000..8bfcb40104
--- /dev/null
+++ b/js/src/product-feed/submission-success-guide/google-credits/footer.js
@@ -0,0 +1,44 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { Fragment } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { GUIDE_NAMES } from '.~/constants';
+import { EVENT_NAME } from '../constants';
+import AppButton from '.~/components/app-button';
+import AddPaidCampaignButton from '.~/components/paid-ads/add-paid-campaign-button';
+
+const Footer = ( { handleGuideFinish } ) => {
+	return (
+		<Fragment>
+			<div className="gla-submission-success-guide__space_holder" />
+
+			<AppButton
+				isSecondary
+				data-action="maybe-later"
+				onClick={ handleGuideFinish }
+			>
+				{ __( 'Maybe later', 'google-listings-and-ads' ) }
+			</AppButton>
+
+			<AddPaidCampaignButton
+				isPrimary
+				isSecondary={ false }
+				isSmall={ false }
+				eventName={ EVENT_NAME }
+				eventProps={ {
+					context: GUIDE_NAMES.SUBMISSION_SUCCESS,
+					action: 'create-paid-campaign',
+				} }
+			>
+				{ __( 'Create paid campaign', 'google-listings-and-ads' ) }
+			</AddPaidCampaignButton>
+		</Fragment>
+	);
+};
+
+export default Footer;
diff --git a/js/src/product-feed/submission-success-guide/google-credits/index.js b/js/src/product-feed/submission-success-guide/google-credits/index.js
new file mode 100644
index 0000000000..47781e27fd
--- /dev/null
+++ b/js/src/product-feed/submission-success-guide/google-credits/index.js
@@ -0,0 +1,48 @@
+/**
+ * External dependencies
+ */
+import { createInterpolateElement } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import GuidePageContent, {
+	ContentLink,
+} from '.~/components/guide-page-content';
+
+const GoogleCredits = () => {
+	return (
+		<GuidePageContent
+			title={ __(
+				'Spend $500 to get $500 in Google Ads credits',
+				'google-listings-and-ads'
+			) }
+		>
+			<p>
+				{ __(
+					'New to Google Ads? Get $500 in ad credit when you spend $500 within your first 60 days* You can edit or cancel your campaign at any time.',
+					'google-listings-and-ads'
+				) }
+			</p>
+			<cite>
+				{ createInterpolateElement(
+					__(
+						'*Full terms and conditions <link>here</link>.',
+						'google-listings-and-ads'
+					),
+					{
+						link: (
+							<ContentLink
+								href="https://www.google.com/ads/coupons/terms/"
+								context="terms-of-ads-coupons"
+							/>
+						),
+					}
+				) }
+			</cite>
+		</GuidePageContent>
+	);
+};
+
+export default GoogleCredits;
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index 1a89522eff..1dc22a2e30 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -1,47 +1,27 @@
 /**
  * External dependencies
  */
-import { getHistory } from '@woocommerce/navigation';
-import {
-	createInterpolateElement,
-	useEffect,
-	useCallback,
-} from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
+import { useEffect, useCallback } from '@wordpress/element';
+import { getHistory } from '@woocommerce/navigation';
 
 /**
  * Internal dependencies
  */
-import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
+import { glaData, GUIDE_NAMES, LOCAL_STORAGE_KEYS } from '.~/constants';
+import { getProductFeedUrl } from '.~/utils/urls';
+import { recordGlaEvent } from '.~/utils/tracks';
+import { EVENT_NAME } from './constants';
 import Guide from '.~/external-components/wordpress/guide';
-import GuidePageContent, {
-	ContentLink,
-} from '.~/components/guide-page-content';
-import AppButton from '.~/components/app-button';
-import AddPaidCampaignButton from '.~/components/paid-ads/add-paid-campaign-button';
-import {
-	glaData,
-	GUIDE_NAMES,
-	LOCAL_STORAGE_KEYS,
-	GOOGLE_ADS_ACCOUNT_STATUS,
-	CAMPAIGN_TYPE_PMAX,
-} from '.~/constants';
 import localStorage from '.~/utils/localStorage';
-import { getProductFeedUrl } from '.~/utils/urls';
+import DynamicScreenContent from './dynamic-screen-content';
+import DynamicScreenFooter from './dynamic-screen-footer';
+import SetupSuccess from './setup-success';
+import SetupSuccessFooter from './setup-success/footer';
 import wooLogoURL from './woocommerce-logo.svg';
 import googleLogoURL from '.~/images/google-logo.svg';
-import { recordGlaEvent } from '.~/utils/tracks';
-import EnhancedConversion from './EnhancedConversion';
-import EnhancedConversionFooter from './EnhancedConversionFooter';
-import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
 import './index.scss';
 
-const EVENT_NAME = 'gla_modal_closed';
-const SUCCESS_SCREEN = 'success-screen';
-const GOOGLE_ADS_CREDITS_SCREEN = 'google-ads-credits-screen';
-const ENHANCED_CONVERSION_TRACKING_SCREEN =
-	'enhanced-conversion-tracking-screen';
-
 const image = (
 	<div className="gla-submission-success-guide__logo-block">
 		<div className="gla-submission-success-guide__logo-item">
@@ -77,56 +57,22 @@ const handleGuideFinish = ( e ) => {
 	} );
 };
 
-const PAGES = {
-	[ SUCCESS_SCREEN ]: {
+const pages = [
+	{
 		image,
-		content: (
-			<GuidePageContent
-				title={ __(
-					'You’ve successfully set up Google Listings & Ads! 🎉',
-					'google-listings-and-ads'
-				) }
-			>
-				<p>
-					{ __(
-						'Your products are being synced and reviewed. Google reviews product listings in 3-5 days.',
-						'google-listings-and-ads'
-					) }
-				</p>
-				<p>
-					{ glaData.adsSetupComplete
-						? __(
-								'No ads will launch yet and you won’t be charged until Google approves your listings. Updates are available in your WooCommerce dashboard.',
-								'google-listings-and-ads'
-						  )
-						: createInterpolateElement(
-								__(
-									'<productFeedLink>Manage and edit your product feed in WooCommerce.</productFeedLink> We will also notify you of any product feed issues to ensure your products get approved and perform well on Google.',
-									'google-listings-and-ads'
-								),
-								{
-									productFeedLink: (
-										<ContentLink
-											href={ getProductFeedUrl() }
-											context="product-feed"
-										/>
-									),
-								}
-						  ) }
-				</p>
-			</GuidePageContent>
-		),
-		footer: (
-			<AppButton
-				isPrimary
-				data-action="view-product-feed"
-				onClick={ handleGuideFinish }
-			>
-				{ __( 'View product feed', 'google-listings-and-ads' ) }
-			</AppButton>
-		),
+		content: <SetupSuccess />,
+		footer: <SetupSuccessFooter handleGuideFinish={ handleGuideFinish } />,
 	},
-};
+	{
+		image,
+		content: <DynamicScreenContent />,
+		footer: <DynamicScreenFooter handleGuideFinish={ handleGuideFinish } />,
+	},
+];
+
+if ( glaData.adsSetupComplete ) {
+	pages.pop();
+}
 
 /**
  * Modal window to greet the user at Product Feed, after successful completion of onboarding.
@@ -138,14 +84,6 @@ const PAGES = {
  * @fires gla_modal_open with `context: GUIDE_NAMES.SUBMISSION_SUCCESS`
  */
 const SubmissionSuccessGuide = () => {
-	const { data: campaigns, loaded: adsCampaignsLoaded } = useAdsCampaigns();
-	const { googleAdsAccount, hasFinishedResolution: googleAdsAccountLoaded } =
-		useGoogleAdsAccount();
-
-	const pmaxCampaigns = campaigns?.filter(
-		( { type } ) => type === CAMPAIGN_TYPE_PMAX
-	);
-
 	useEffect( () => {
 		recordGlaEvent( 'gla_modal_open', {
 			context: GUIDE_NAMES.SUBMISSION_SUCCESS,
@@ -162,98 +100,6 @@ const SubmissionSuccessGuide = () => {
 	// @todo: Review whether we need that function since we have moved the buttons to be per page now.
 	const renderFinish = useCallback( () => null, [] );
 
-	const showEnhancedConversionTrackingScreen =
-		pmaxCampaigns?.length &&
-		googleAdsAccount?.status === GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED &&
-		googleAdsAccountLoaded &&
-		adsCampaignsLoaded;
-
-	const showGoogleAdsCreditsScreen =
-		! pmaxCampaigns?.length && googleAdsAccountLoaded && adsCampaignsLoaded;
-
-	if ( showEnhancedConversionTrackingScreen ) {
-		delete PAGES[ GOOGLE_ADS_CREDITS_SCREEN ];
-
-		PAGES[ ENHANCED_CONVERSION_TRACKING_SCREEN ] = {
-			image,
-			content: <EnhancedConversion />,
-			footer: (
-				<EnhancedConversionFooter
-					handleGuideFinish={ handleGuideFinish }
-				/>
-			),
-		};
-	} else if ( showGoogleAdsCreditsScreen ) {
-		delete PAGES[ ENHANCED_CONVERSION_TRACKING_SCREEN ];
-
-		// There are no campaigns, add Google Ads credit screen
-		PAGES[ GOOGLE_ADS_CREDITS_SCREEN ] = {
-			image,
-			content: (
-				<GuidePageContent
-					title={ __(
-						'Spend $500 to get $500 in Google Ads credits',
-						'google-listings-and-ads'
-					) }
-				>
-					<p>
-						{ __(
-							'New to Google Ads? Get $500 in ad credit when you spend $500 within your first 60 days* You can edit or cancel your campaign at any time.',
-							'google-listings-and-ads'
-						) }
-					</p>
-					<cite>
-						{ createInterpolateElement(
-							__(
-								'*Full terms and conditions <link>here</link>.',
-								'google-listings-and-ads'
-							),
-							{
-								link: (
-									<ContentLink
-										href="https://www.google.com/ads/coupons/terms/"
-										context="terms-of-ads-coupons"
-									/>
-								),
-							}
-						) }
-					</cite>
-				</GuidePageContent>
-			),
-			footer: (
-				<>
-					<div className="gla-submission-success-guide__space_holder" />
-
-					<AddPaidCampaignButton
-						isPrimary
-						isSecondary={ false }
-						isSmall={ false }
-						eventName={ EVENT_NAME }
-						eventProps={ {
-							context: GUIDE_NAMES.SUBMISSION_SUCCESS,
-							action: 'create-paid-campaign',
-						} }
-					>
-						{ __(
-							'Create paid campaign',
-							'google-listings-and-ads'
-						) }
-					</AddPaidCampaignButton>
-
-					<AppButton
-						isSecondary
-						data-action="maybe-later"
-						onClick={ handleGuideFinish }
-					>
-						{ __( 'Maybe later', 'google-listings-and-ads' ) }
-					</AppButton>
-				</>
-			),
-		};
-	}
-
-	const pages = Object.keys( PAGES ).map( ( screen ) => PAGES[ screen ] );
-
 	return (
 		<Guide
 			className="gla-submission-success-guide"
diff --git a/js/src/product-feed/submission-success-guide/index.scss b/js/src/product-feed/submission-success-guide/index.scss
index 6f048567fa..477969c24c 100644
--- a/js/src/product-feed/submission-success-guide/index.scss
+++ b/js/src/product-feed/submission-success-guide/index.scss
@@ -122,4 +122,8 @@
 	&__space_holder {
 		flex: 1 1 0;
 	}
+
+	.screen-content--loading {
+		min-width: 469px;
+	}
 }
diff --git a/js/src/product-feed/submission-success-guide/setup-success/footer.js b/js/src/product-feed/submission-success-guide/setup-success/footer.js
new file mode 100644
index 0000000000..aff929f081
--- /dev/null
+++ b/js/src/product-feed/submission-success-guide/setup-success/footer.js
@@ -0,0 +1,28 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { glaData } from '.~/constants';
+import AppButton from '.~/components/app-button';
+
+const Footer = ( { handleGuideFinish } ) => {
+	if ( ! glaData.adsSetupComplete ) {
+		return null;
+	}
+
+	return (
+		<AppButton
+			isPrimary
+			data-action="view-product-feed"
+			onClick={ handleGuideFinish }
+		>
+			{ __( 'View product feed', 'google-listings-and-ads' ) }
+		</AppButton>
+	);
+};
+
+export default Footer;
diff --git a/js/src/product-feed/submission-success-guide/setup-success/index.js b/js/src/product-feed/submission-success-guide/setup-success/index.js
new file mode 100644
index 0000000000..fa1766a570
--- /dev/null
+++ b/js/src/product-feed/submission-success-guide/setup-success/index.js
@@ -0,0 +1,55 @@
+/**
+ * External dependencies
+ */
+import { createInterpolateElement } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { getProductFeedUrl } from '.~/utils/urls';
+import { glaData } from '.~/constants';
+import GuidePageContent, {
+	ContentLink,
+} from '.~/components/guide-page-content';
+
+const SetupSuccess = () => {
+	return (
+		<GuidePageContent
+			title={ __(
+				'You’ve successfully set up Google Listings & Ads! 🎉',
+				'google-listings-and-ads'
+			) }
+		>
+			<p>
+				{ __(
+					'Your products are being synced and reviewed. Google reviews product listings in 3-5 days.',
+					'google-listings-and-ads'
+				) }
+			</p>
+			<p>
+				{ glaData.adsSetupComplete
+					? __(
+							'No ads will launch yet and you won’t be charged until Google approves your listings. Updates are available in your WooCommerce dashboard.',
+							'google-listings-and-ads'
+					  )
+					: createInterpolateElement(
+							__(
+								'<productFeedLink>Manage and edit your product feed in WooCommerce.</productFeedLink> We will also notify you of any product feed issues to ensure your products get approved and perform well on Google.',
+								'google-listings-and-ads'
+							),
+							{
+								productFeedLink: (
+									<ContentLink
+										href={ getProductFeedUrl() }
+										context="product-feed"
+									/>
+								),
+							}
+					  ) }
+			</p>
+		</GuidePageContent>
+	);
+};
+
+export default SetupSuccess;

From 120d10c83707594e3c395beab104563e6db649f6 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 20 Feb 2024 16:25:45 +0400
Subject: [PATCH 40/95] Add adsConnected property to glaData.

---
 .../cta/index.js                              |  9 +++---
 js/src/constants.js                           |  3 ++
 .../enhanced-conversion/index.js              | 29 +++++++++++++++++++
 .../submission-success-guide/index.js         |  2 +-
 .../setup-success/footer.js                   |  2 +-
 src/Admin/Admin.php                           |  1 +
 6 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
index fd6ad6eea5..842f13d5ff 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
@@ -8,7 +8,10 @@ import { Spinner } from '@woocommerce/components';
 /**
  * Internal dependencies
  */
-import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
+import {
+	ENHANCED_ADS_CONVERSION_STATUS,
+	ENHANCED_ADS_TOS_BASE_URL,
+} from '.~/constants';
 import { useAppDispatch } from '.~/data';
 import AppButton from '.~/components/app-button';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
@@ -32,8 +35,6 @@ const CTA = ( {
 		useAcceptedCustomerDataTerms();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 
-	const TOS_URL = 'https://ads.google.com/aw/conversions/customersettings';
-
 	useEffect( () => {
 		if (
 			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
@@ -43,7 +44,7 @@ const CTA = ( {
 	}, [ allowEnhancedConversions, invalidateResolution ] );
 
 	const handleTOS = useCallback( () => {
-		window.open( TOS_URL, '_blank' );
+		window.open( ENHANCED_ADS_TOS_BASE_URL, '_blank' );
 
 		updateEnhancedAdsConversionStatus(
 			ENHANCED_ADS_CONVERSION_STATUS.PENDING
diff --git a/js/src/constants.js b/js/src/constants.js
index 46aa330a12..3d3009f0f9 100644
--- a/js/src/constants.js
+++ b/js/src/constants.js
@@ -117,3 +117,6 @@ export const ENHANCED_ADS_CONVERSION_STATUS = {
 	ENABLED: 'enabled',
 	DISABLED: 'disabled',
 };
+
+export const ENHANCED_ADS_TOS_BASE_URL =
+	'https://ads.google.com/aw/conversions/customersettings';
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
index 623aba4758..37ca0d232a 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
@@ -7,15 +7,22 @@ import { createInterpolateElement } from '@wordpress/element';
 /**
  * Internal dependencies
  */
+import {
+	ENHANCED_ADS_CONVERSION_STATUS,
+	ENHANCED_ADS_TOS_BASE_URL,
+} from '.~/constants';
+import TrackableLink from '.~/components/trackable-link';
 import LoadingLabel from '.~/components/loading-label';
 import GuidePageContent from '.~/components/guide-page-content';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 
 const EnhancedConversion = () => {
 	const {
 		acceptedCustomerDataTerms: hasAcceptedTerms,
 		hasFinishedResolution,
 	} = useAcceptedCustomerDataTerms();
+	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 
 	return (
 		<GuidePageContent
@@ -59,6 +66,28 @@ const EnhancedConversion = () => {
 					) }
 				</p>
 			) }
+
+			{ allowEnhancedConversions ===
+				ENHANCED_ADS_CONVERSION_STATUS.PENDING && (
+				<p>
+					{ createInterpolateElement(
+						__(
+							'Enhanced Conversion Tracking will be enabled once you’ve agreed to the terms of service on Google Ads, which can be found in your <link>Google Ads settings screen</link>.',
+							'google-listings-and-ads'
+						),
+						{
+							link: (
+								<TrackableLink
+									href={ ENHANCED_ADS_TOS_BASE_URL }
+									target="_blank"
+									type="external"
+									eventName="gla_ads_tos" // @todo: review eventName
+								/>
+							),
+						}
+					) }
+				</p>
+			) }
 		</GuidePageContent>
 	);
 };
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index 1dc22a2e30..06c2ba2704 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -70,7 +70,7 @@ const pages = [
 	},
 ];
 
-if ( glaData.adsSetupComplete ) {
+if ( ! glaData.adsConnected ) {
 	pages.pop();
 }
 
diff --git a/js/src/product-feed/submission-success-guide/setup-success/footer.js b/js/src/product-feed/submission-success-guide/setup-success/footer.js
index aff929f081..442e7486c8 100644
--- a/js/src/product-feed/submission-success-guide/setup-success/footer.js
+++ b/js/src/product-feed/submission-success-guide/setup-success/footer.js
@@ -10,7 +10,7 @@ import { glaData } from '.~/constants';
 import AppButton from '.~/components/app-button';
 
 const Footer = ( { handleGuideFinish } ) => {
-	if ( ! glaData.adsSetupComplete ) {
+	if ( glaData.adsConnected ) {
 		return null;
 	}
 
diff --git a/src/Admin/Admin.php b/src/Admin/Admin.php
index 07b6c31f27..aa3d6d2000 100644
--- a/src/Admin/Admin.php
+++ b/src/Admin/Admin.php
@@ -137,6 +137,7 @@ protected function get_assets(): array {
 				'mcSupportedLanguage'      => $this->merchant_center->is_language_supported(),
 				'adsCampaignConvertStatus' => $this->options->get( OptionsInterface::CAMPAIGN_CONVERT_STATUS ),
 				'adsSetupComplete'         => $this->ads->is_setup_complete(),
+				'adsConnected'             => $this->ads->is_connected(),
 				'enableReports'            => $this->enableReports(),
 				'dateFormat'               => get_option( 'date_format' ),
 				'timeFormat'               => get_option( 'time_format' ),

From 23901789bd92f39783e9e6ddba56e2f151185ca4 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 20 Feb 2024 16:31:19 +0400
Subject: [PATCH 41/95] Have a single endpoint.

---
 .../enhanced-conversion-tracking-settings/cta/index.js    | 2 +-
 .../cta/{PendingStatus.js => pending-status.js}           | 0
 js/src/data/actions.js                                    | 2 +-
 js/src/data/resolvers.js                                  | 2 +-
 src/API/Site/Controllers/Ads/AccountController.php        | 8 +-------
 .../API/Site/Controllers/Ads/AccountControllerTest.php    | 4 ++--
 6 files changed, 6 insertions(+), 12 deletions(-)
 rename js/src/components/enhanced-conversion-tracking-settings/cta/{PendingStatus.js => pending-status.js} (100%)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
index 842f13d5ff..efd9cfd0e9 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
@@ -16,7 +16,7 @@ import { useAppDispatch } from '.~/data';
 import AppButton from '.~/components/app-button';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
-import PendingStatus from './PendingStatus';
+import PendingStatus from './pending-status';
 
 const CTA = ( {
 	acceptTermsLabel = __(
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js b/js/src/components/enhanced-conversion-tracking-settings/cta/pending-status.js
similarity index 100%
rename from js/src/components/enhanced-conversion-tracking-settings/cta/PendingStatus.js
rename to js/src/components/enhanced-conversion-tracking-settings/cta/pending-status.js
diff --git a/js/src/data/actions.js b/js/src/data/actions.js
index 8460263cb9..68f0ad3d2b 100644
--- a/js/src/data/actions.js
+++ b/js/src/data/actions.js
@@ -1264,7 +1264,7 @@ export function receiveAcceptedTerms( data ) {
 export function* updateEnhancedAdsConversionStatus( status ) {
 	try {
 		const response = yield apiFetch( {
-			path: `${ API_NAMESPACE }/ads/update-enhanced-conversion-status`,
+			path: `${ API_NAMESPACE }/ads/enhanced-conversion-status`,
 			method: REQUEST_ACTIONS.POST,
 			data: {
 				status,
diff --git a/js/src/data/resolvers.js b/js/src/data/resolvers.js
index e9cad9572d..9f19db363f 100644
--- a/js/src/data/resolvers.js
+++ b/js/src/data/resolvers.js
@@ -549,7 +549,7 @@ export function* getAcceptedCustomerDataTerms() {
 export function* getAllowEnhancedConversions() {
 	try {
 		const response = yield apiFetch( {
-			path: `${ API_NAMESPACE }/ads/allow-enhance-conversions`,
+			path: `${ API_NAMESPACE }/ads/enhanced-conversion-status`,
 		} );
 
 		yield receiveAllowEnhancedConversions( response );
diff --git a/src/API/Site/Controllers/Ads/AccountController.php b/src/API/Site/Controllers/Ads/AccountController.php
index 9e959e525c..4b0b4d5183 100644
--- a/src/API/Site/Controllers/Ads/AccountController.php
+++ b/src/API/Site/Controllers/Ads/AccountController.php
@@ -99,19 +99,13 @@ public function register_routes(): void {
 		);
 
 		$this->register_route(
-			'ads/update-enhanced-conversion-status',
+			'ads/enhanced-conversion-status',
 			[
 				[
 					'methods'             => TransportMethods::EDITABLE,
 					'callback'            => $this->update_enhanced_ads_conversion_callback(),
 					'permission_callback' => $this->get_permission_callback(),
 				],
-			]
-		);
-
-		$this->register_route(
-			'ads/allow-enhance-conversions',
-			[
 				[
 					'methods'             => TransportMethods::READABLE,
 					'callback'            => $this->get_enhanced_conversion_status_callback(),
diff --git a/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php b/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
index ade8ce7c7f..7206880479 100644
--- a/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
+++ b/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
@@ -26,8 +26,8 @@ class AccountControllerTest extends RESTControllerUnitTest {
 	protected const ROUTE_CONNECTION          = '/wc/gla/ads/connection';
 	protected const ROUTE_BILLING_STATUS      = '/wc/gla/ads/billing-status';
 	protected const ROUTE_ACCEPTED_DATA_TERMS = '/wc/gla/ads/accepted-customer-data-terms';
-	protected const ROUTE_UPDATED_EC_STATUS   = '/wc/gla/ads/update-enhanced-conversion-status';
-	protected const ROUTE_GET_EC_STATUS       = '/wc/gla/ads/allow-enhance-conversions';
+	protected const ROUTE_UPDATED_EC_STATUS   = '/wc/gla/ads/enhanced-conversion-status';
+	protected const ROUTE_GET_EC_STATUS       = '/wc/gla/ads/enhanced-conversion-status';
 	protected const TEST_ACCOUNT_ID           = 1234567890;
 	protected const TEST_BILLING_URL          = 'https://domain.test/billing/setup/';
 	protected const TEST_BILLING_STATUS       = 'pending';

From 23eff1b87755820360e029a838369c33609ad7e4 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 20 Feb 2024 16:52:15 +0400
Subject: [PATCH 42/95] Add PendingNotice component.

---
 .../index.js                                  | 12 ++++++-
 .../pending-notice.js                         | 36 +++++++++++++++++++
 .../enhanced-conversion/index.js              | 28 ++-------------
 src/API/Google/Ads.php                        |  5 ++-
 4 files changed, 52 insertions(+), 29 deletions(-)
 create mode 100644 js/src/components/enhanced-conversion-tracking-settings/pending-notice.js

diff --git a/js/src/components/enhanced-conversion-tracking-settings/index.js b/js/src/components/enhanced-conversion-tracking-settings/index.js
index 87576e9367..a7f7e8aec6 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/index.js
@@ -6,10 +6,15 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { GOOGLE_ADS_ACCOUNT_STATUS } from '.~/constants';
+import {
+	GOOGLE_ADS_ACCOUNT_STATUS,
+	ENHANCED_ADS_CONVERSION_STATUS,
+} from '.~/constants';
 import SpinnerCard from '.~/components/spinner-card';
 import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
+import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import Section from '.~/wcdl/section';
+import PendingNotice from '.~/components/enhanced-conversion-tracking-settings/pending-notice';
 import VerticalGapLayout from '.~/components/vertical-gap-layout';
 import CTA from './cta';
 
@@ -29,6 +34,7 @@ const TITLE = __( 'Enhanced Conversion Tracking', 'google-listings-and-ads' );
  */
 const EnhancedConversionTrackingSettings = () => {
 	const { googleAdsAccount, hasFinishedResolution } = useGoogleAdsAccount();
+	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 
 	if (
 		( ! googleAdsAccount ||
@@ -47,6 +53,10 @@ const EnhancedConversionTrackingSettings = () => {
 				<VerticalGapLayout size="large">
 					<Section.Card>
 						<Section.Card.Body>
+							{ allowEnhancedConversions ===
+								ENHANCED_ADS_CONVERSION_STATUS.PENDING && (
+								<PendingNotice />
+							) }
 							<CTA />
 						</Section.Card.Body>
 					</Section.Card>
diff --git a/js/src/components/enhanced-conversion-tracking-settings/pending-notice.js b/js/src/components/enhanced-conversion-tracking-settings/pending-notice.js
new file mode 100644
index 0000000000..731b684852
--- /dev/null
+++ b/js/src/components/enhanced-conversion-tracking-settings/pending-notice.js
@@ -0,0 +1,36 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { createInterpolateElement } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { ENHANCED_ADS_TOS_BASE_URL } from '.~/constants';
+import TrackableLink from '.~/components/trackable-link';
+
+const PendingNotice = () => {
+	return (
+		<p>
+			{ createInterpolateElement(
+				__(
+					'Enhanced Conversion Tracking will be enabled once you’ve agreed to the terms of service on Google Ads, which can be found in your <link>Google Ads settings screen</link>.',
+					'google-listings-and-ads'
+				),
+				{
+					link: (
+						<TrackableLink
+							href={ ENHANCED_ADS_TOS_BASE_URL }
+							target="_blank"
+							type="external"
+							eventName="gla_ads_tos" // @todo: review eventName
+						/>
+					),
+				}
+			) }
+		</p>
+	);
+};
+
+export default PendingNotice;
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
index 37ca0d232a..280a160b53 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
@@ -7,13 +7,10 @@ import { createInterpolateElement } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import {
-	ENHANCED_ADS_CONVERSION_STATUS,
-	ENHANCED_ADS_TOS_BASE_URL,
-} from '.~/constants';
-import TrackableLink from '.~/components/trackable-link';
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import LoadingLabel from '.~/components/loading-label';
 import GuidePageContent from '.~/components/guide-page-content';
+import PendingNotice from '.~/components/enhanced-conversion-tracking-settings/pending-notice';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 
@@ -68,26 +65,7 @@ const EnhancedConversion = () => {
 			) }
 
 			{ allowEnhancedConversions ===
-				ENHANCED_ADS_CONVERSION_STATUS.PENDING && (
-				<p>
-					{ createInterpolateElement(
-						__(
-							'Enhanced Conversion Tracking will be enabled once you’ve agreed to the terms of service on Google Ads, which can be found in your <link>Google Ads settings screen</link>.',
-							'google-listings-and-ads'
-						),
-						{
-							link: (
-								<TrackableLink
-									href={ ENHANCED_ADS_TOS_BASE_URL }
-									target="_blank"
-									type="external"
-									eventName="gla_ads_tos" // @todo: review eventName
-								/>
-							),
-						}
-					) }
-				</p>
-			) }
+				ENHANCED_ADS_CONVERSION_STATUS.PENDING && <PendingNotice /> }
 		</GuidePageContent>
 	);
 };
diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index 8448361ef0..c6de70f62e 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -339,7 +339,7 @@ public function get_accepted_customer_data_terms(): ?bool {
 
 			// Retrieve the terms acceptance data from options.
 			if ( null !== $accepted_terms ) {
-				return $accepted_terms;
+				return boolval( $accepted_terms );
 			}
 
 			$customer = ( new AdsAccountQuery() )
@@ -355,10 +355,9 @@ public function get_accepted_customer_data_terms(): ?bool {
 			$conversion_tracking_setting = $customer->getConversionTrackingSetting();
 
 			$accepted = $conversion_tracking_setting->getAcceptedCustomerDataTerms();
-			$status   = $accepted ? 1 : 0;
 
 			// Save the data terms in options as those cannot be reverted.
-			$this->options->update( OptionsInterface::CUSTOMER_DATA_TERMS, $status );
+			$this->options->update( OptionsInterface::CUSTOMER_DATA_TERMS, $accepted );
 
 			return $accepted;
 		} catch ( ApiException $e ) {

From 14f926b5987faa66de86877fb1ae52b3e4294a21 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 20 Feb 2024 16:55:50 +0400
Subject: [PATCH 43/95] Make use of adsConnected property og glaData.

---
 .../index.js                                  | 42 +++++++------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/index.js b/js/src/components/enhanced-conversion-tracking-settings/index.js
index a7f7e8aec6..3e3397507b 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/index.js
@@ -6,12 +6,7 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import {
-	GOOGLE_ADS_ACCOUNT_STATUS,
-	ENHANCED_ADS_CONVERSION_STATUS,
-} from '.~/constants';
-import SpinnerCard from '.~/components/spinner-card';
-import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
+import { ENHANCED_ADS_CONVERSION_STATUS, glaData } from '.~/constants';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import Section from '.~/wcdl/section';
 import PendingNotice from '.~/components/enhanced-conversion-tracking-settings/pending-notice';
@@ -33,35 +28,26 @@ const TITLE = __( 'Enhanced Conversion Tracking', 'google-listings-and-ads' );
  * Renders the settings panel for enhanced conversion tracking
  */
 const EnhancedConversionTrackingSettings = () => {
-	const { googleAdsAccount, hasFinishedResolution } = useGoogleAdsAccount();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 
-	if (
-		( ! googleAdsAccount ||
-			googleAdsAccount?.status !==
-				GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED ) &&
-		hasFinishedResolution
-	) {
+	if ( ! glaData.adsConnected ) {
 		return null;
 	}
 
 	return (
 		<Section title={ TITLE } description={ DESCRIPTION }>
-			{ ! hasFinishedResolution && <SpinnerCard /> }
-
-			{ hasFinishedResolution && (
-				<VerticalGapLayout size="large">
-					<Section.Card>
-						<Section.Card.Body>
-							{ allowEnhancedConversions ===
-								ENHANCED_ADS_CONVERSION_STATUS.PENDING && (
-								<PendingNotice />
-							) }
-							<CTA />
-						</Section.Card.Body>
-					</Section.Card>
-				</VerticalGapLayout>
-			) }
+			<VerticalGapLayout size="large">
+				<Section.Card>
+					<Section.Card.Body>
+						{ allowEnhancedConversions ===
+							ENHANCED_ADS_CONVERSION_STATUS.PENDING && (
+							<PendingNotice />
+						) }
+
+						<CTA />
+					</Section.Card.Body>
+				</Section.Card>
+			</VerticalGapLayout>
 		</Section>
 	);
 };

From d6c00393ca787fa2e3c4036f8ffce8679c1cd1fe Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 20 Feb 2024 18:18:30 +0400
Subject: [PATCH 44/95] Add adsConnected to global properties.

---
 jest.config.js                                                | 1 +
 .../submission-success-guide/dynamic-screen-footer.js         | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/jest.config.js b/jest.config.js
index 935051d13a..66ef3cadd0 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -47,6 +47,7 @@ module.exports = {
 			mcSupportedCountry: true,
 			mcSupportedLanguage: true,
 			adsSetupComplete: true,
+			adsConnected: true,
 			enableReports: true,
 			dateFormat: 'F j, Y',
 			timeFormat: 'g:i a',
diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js b/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
index 68a01696d3..737260b576 100644
--- a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
@@ -35,7 +35,9 @@ const DynamicScreenFooter = ( { handleGuideFinish } ) => {
 		pmaxCampaigns?.length &&
 		googleAdsAccount?.status === GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED
 	) {
-		return <EnhancedConversionFooter />;
+		return (
+			<EnhancedConversionFooter handleGuideFinish={ handleGuideFinish } />
+		);
 	}
 
 	return <GoogleCreditsFooter handleGuideFinish={ handleGuideFinish } />;

From f49f341b99d55fe59b64fd1e932503a8d487719a Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 20 Feb 2024 18:41:56 +0400
Subject: [PATCH 45/95] Update conditions.

---
 .../dynamic-screen-content.js                 | 12 +++-------
 .../dynamic-screen-footer.js                  | 12 +++-------
 .../submission-success-guide/index.test.js    | 22 -------------------
 3 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-content.js b/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
index e23ea6ab62..6a7f35ed4b 100644
--- a/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
@@ -6,24 +6,21 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { GOOGLE_ADS_ACCOUNT_STATUS, CAMPAIGN_TYPE_PMAX } from '.~/constants';
+import { CAMPAIGN_TYPE_PMAX, glaData } from '.~/constants';
 import LoadingLabel from '.~/components/loading-label';
 import GuidePageContent from '.~/components/guide-page-content';
 import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
-import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
 import EnhancedConversion from './enhanced-conversion';
 import GoogleCredits from './google-credits';
 
 const DynamicScreenContent = () => {
 	const { data: campaigns, loading: adsCampaignsLoading } = useAdsCampaigns();
-	const { googleAdsAccount, isResolving: googleAdsAccountLoading } =
-		useGoogleAdsAccount();
 
 	const pmaxCampaigns = campaigns?.filter(
 		( { type } ) => type === CAMPAIGN_TYPE_PMAX
 	);
 
-	if ( adsCampaignsLoading || googleAdsAccountLoading ) {
+	if ( adsCampaignsLoading ) {
 		return (
 			<GuidePageContent
 				title={ __( 'Please wait', 'google-listings-and-ads' ) }
@@ -35,10 +32,7 @@ const DynamicScreenContent = () => {
 		);
 	}
 
-	if (
-		pmaxCampaigns?.length &&
-		googleAdsAccount?.status === GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED
-	) {
+	if ( pmaxCampaigns?.length && glaData.adsConnected ) {
 		return <EnhancedConversion />;
 	}
 
diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js b/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
index 737260b576..4e8ea0dd74 100644
--- a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
@@ -6,23 +6,20 @@ import { Fragment } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { GOOGLE_ADS_ACCOUNT_STATUS, CAMPAIGN_TYPE_PMAX } from '.~/constants';
+import { CAMPAIGN_TYPE_PMAX, glaData } from '.~/constants';
 import LoadingLabel from '.~/components/loading-label';
 import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
-import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
 import EnhancedConversionFooter from './enhanced-conversion/footer';
 import GoogleCreditsFooter from './google-credits/footer';
 
 const DynamicScreenFooter = ( { handleGuideFinish } ) => {
 	const { data: campaigns, loading: adsCampaignsLoading } = useAdsCampaigns();
-	const { googleAdsAccount, isResolving: googleAdsAccountLoading } =
-		useGoogleAdsAccount();
 
 	const pmaxCampaigns = campaigns?.filter(
 		( { type } ) => type === CAMPAIGN_TYPE_PMAX
 	);
 
-	if ( adsCampaignsLoading || googleAdsAccountLoading ) {
+	if ( adsCampaignsLoading ) {
 		return (
 			<Fragment>
 				<div className="gla-submission-success-guide__space_holder" />
@@ -31,10 +28,7 @@ const DynamicScreenFooter = ( { handleGuideFinish } ) => {
 		);
 	}
 
-	if (
-		pmaxCampaigns?.length &&
-		googleAdsAccount?.status === GOOGLE_ADS_ACCOUNT_STATUS.CONNECTED
-	) {
+	if ( pmaxCampaigns?.length && glaData.adsConnected ) {
 		return (
 			<EnhancedConversionFooter handleGuideFinish={ handleGuideFinish } />
 		);
diff --git a/js/src/product-feed/submission-success-guide/index.test.js b/js/src/product-feed/submission-success-guide/index.test.js
index 4472621bd8..083e8876f5 100644
--- a/js/src/product-feed/submission-success-guide/index.test.js
+++ b/js/src/product-feed/submission-success-guide/index.test.js
@@ -2,10 +2,6 @@ jest.mock( '.~/hooks/useAdsCampaigns', () =>
 	jest.fn().mockName( 'useAdsCampaigns' )
 );
 
-jest.mock( '.~/hooks/useGoogleAdsAccount', () =>
-	jest.fn().mockName( 'useGoogleAdsAccount' ).mockReturnValue( {} )
-);
-
 jest.mock( '.~/hooks/useDispatchCoreNotices', () => ( {
 	__esModule: true,
 	default: jest
@@ -30,16 +26,8 @@ import '@testing-library/jest-dom';
  */
 import SubmissionSuccessGuide from './index';
 import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
-import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
 import { CAMPAIGN_TYPE_PMAX } from '.~/constants';
 
-const CONNECTED_ADS_ACCOUNT = {
-	id: 777777,
-	currency: 'PLN',
-	symbol: 'zł',
-	status: 'connected',
-};
-
 const PAID_CAMPAIGN = {
 	id: 10,
 	name: 'PMax Campaign',
@@ -64,11 +52,6 @@ describe( 'SubmissionSuccessGuide', () => {
 	} );
 
 	test( 'Renders the Google Ads credit screen if there are no paid campaigns', () => {
-		useGoogleAdsAccount.mockReturnValue( {
-			googleAdsAccount: CONNECTED_ADS_ACCOUNT,
-			hasFinishedResolution: true,
-		} );
-
 		useAdsCampaigns.mockReturnValue( {
 			data: [ FREE_CAMPAIGN ],
 			loaded: true,
@@ -85,11 +68,6 @@ describe( 'SubmissionSuccessGuide', () => {
 	} );
 
 	test( 'Renders the enhanced tracking screen if there are paid campaigns', () => {
-		useGoogleAdsAccount.mockReturnValue( {
-			googleAdsAccount: CONNECTED_ADS_ACCOUNT,
-			hasFinishedResolution: true,
-		} );
-
 		useAdsCampaigns.mockReturnValue( {
 			data: [ PAID_CAMPAIGN ],
 			loaded: true,

From d43057a0093e371870a0c93e47f18d3332ddb18c Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 20 Feb 2024 18:54:35 +0400
Subject: [PATCH 46/95] Add filter for TOS value.

---
 src/API/Google/Ads.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index c6de70f62e..d54dec7a4b 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -339,7 +339,7 @@ public function get_accepted_customer_data_terms(): ?bool {
 
 			// Retrieve the terms acceptance data from options.
 			if ( null !== $accepted_terms ) {
-				return boolval( $accepted_terms );
+				return apply_filters( 'woocommerce_gla_ads_enhanced_conversion_customer_data_terms', boolval( $accepted_terms ) );
 			}
 
 			$customer = ( new AdsAccountQuery() )
@@ -359,7 +359,7 @@ public function get_accepted_customer_data_terms(): ?bool {
 			// Save the data terms in options as those cannot be reverted.
 			$this->options->update( OptionsInterface::CUSTOMER_DATA_TERMS, $accepted );
 
-			return $accepted;
+			return apply_filters( 'woocommerce_gla_ads_enhanced_conversion_customer_data_terms', $accepted );
 		} catch ( ApiException $e ) {
 			do_action( 'woocommerce_gla_ads_client_exception', $e, __METHOD__ );
 		}

From 5b0731d15842d24f49153e0df3f6b021cf849fb3 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Wed, 21 Feb 2024 16:38:24 +0400
Subject: [PATCH 47/95] Fix condition to display pending state.

---
 .../enhanced-conversion-tracking-settings/index.js         | 7 ++++---
 .../submission-success-guide/enhanced-conversion/index.js  | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/index.js b/js/src/components/enhanced-conversion-tracking-settings/index.js
index 3e3397507b..2edffea2c2 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/index.js
@@ -8,6 +8,7 @@ import { __ } from '@wordpress/i18n';
  */
 import { ENHANCED_ADS_CONVERSION_STATUS, glaData } from '.~/constants';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
+import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import Section from '.~/wcdl/section';
 import PendingNotice from '.~/components/enhanced-conversion-tracking-settings/pending-notice';
 import VerticalGapLayout from '.~/components/vertical-gap-layout';
@@ -28,6 +29,7 @@ const TITLE = __( 'Enhanced Conversion Tracking', 'google-listings-and-ads' );
  * Renders the settings panel for enhanced conversion tracking
  */
 const EnhancedConversionTrackingSettings = () => {
+	const { acceptedCustomerDataTerms } = useAcceptedCustomerDataTerms();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 
 	if ( ! glaData.adsConnected ) {
@@ -40,9 +42,8 @@ const EnhancedConversionTrackingSettings = () => {
 				<Section.Card>
 					<Section.Card.Body>
 						{ allowEnhancedConversions ===
-							ENHANCED_ADS_CONVERSION_STATUS.PENDING && (
-							<PendingNotice />
-						) }
+							ENHANCED_ADS_CONVERSION_STATUS.PENDING &&
+							! acceptedCustomerDataTerms && <PendingNotice /> }
 
 						<CTA />
 					</Section.Card.Body>
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
index 280a160b53..291fb88cf4 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
@@ -65,7 +65,8 @@ const EnhancedConversion = () => {
 			) }
 
 			{ allowEnhancedConversions ===
-				ENHANCED_ADS_CONVERSION_STATUS.PENDING && <PendingNotice /> }
+				ENHANCED_ADS_CONVERSION_STATUS.PENDING &&
+				! hasAcceptedTerms && <PendingNotice /> }
 		</GuidePageContent>
 	);
 };

From 7549b7a83e38524a85e4aad4f6c2fe0e9f6438cd Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Wed, 28 Feb 2024 14:04:57 +0530
Subject: [PATCH 48/95] Update src/API/Google/Ads.php

typecast the returned value from apply_filters to a bool

Co-authored-by: Mik <mikkamp@users.noreply.github.com>
---
 src/API/Google/Ads.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index d54dec7a4b..478ef59951 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -339,7 +339,7 @@ public function get_accepted_customer_data_terms(): ?bool {
 
 			// Retrieve the terms acceptance data from options.
 			if ( null !== $accepted_terms ) {
-				return apply_filters( 'woocommerce_gla_ads_enhanced_conversion_customer_data_terms', boolval( $accepted_terms ) );
+				return (bool) apply_filters( 'woocommerce_gla_ads_enhanced_conversion_customer_data_terms', (bool) $accepted_terms );
 			}
 
 			$customer = ( new AdsAccountQuery() )

From b61d133b74f4f07d11277606b630e7dafe694330 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Wed, 28 Feb 2024 16:57:53 +0530
Subject: [PATCH 49/95] Update options name with ADS_ prefix

---
 src/API/Google/Ads.php                        | 25 +++++++++----------
 .../Controllers/Ads/AccountController.php     |  9 +++++++
 src/Ads/AccountService.php                    |  3 ++-
 src/Options/OptionsInterface.php              |  8 +++---
 tests/Unit/API/Google/AdsTest.php             | 11 ++------
 .../Controllers/Ads/AccountControllerTest.php |  7 ++++++
 tests/Unit/Ads/AccountServiceTest.php         |  5 ++--
 7 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index 478ef59951..74bc299b10 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -331,11 +331,11 @@ private function get_merchant_link( int $merchant_id ): MerchantCenterLink {
 	 *
 	 * @return boolean
 	 */
-	public function get_accepted_customer_data_terms(): ?bool {
+	public function get_accepted_customer_data_terms(): bool {
 		$ads_id = $this->options->get_ads_id();
 
 		try {
-			$accepted_terms = $this->options->get( OptionsInterface::CUSTOMER_DATA_TERMS, null );
+			$accepted_terms = $this->options->get( OptionsInterface::ADS_CUSTOMER_DATA_TERMS, null );
 
 			// Retrieve the terms acceptance data from options.
 			if ( null !== $accepted_terms ) {
@@ -357,14 +357,14 @@ public function get_accepted_customer_data_terms(): ?bool {
 			$accepted = $conversion_tracking_setting->getAcceptedCustomerDataTerms();
 
 			// Save the data terms in options as those cannot be reverted.
-			$this->options->update( OptionsInterface::CUSTOMER_DATA_TERMS, $accepted );
+			$this->options->update( OptionsInterface::ADS_CUSTOMER_DATA_TERMS, $accepted );
 
-			return apply_filters( 'woocommerce_gla_ads_enhanced_conversion_customer_data_terms', $accepted );
+			return (bool) apply_filters( 'woocommerce_gla_ads_enhanced_conversion_customer_data_terms', (bool) $accepted );
 		} catch ( ApiException $e ) {
 			do_action( 'woocommerce_gla_ads_client_exception', $e, __METHOD__ );
 		}
 
-		return null;
+		return false;
 	}
 
 	/**
@@ -373,16 +373,11 @@ public function get_accepted_customer_data_terms(): ?bool {
 	 * @param string $status The status value
 	 *
 	 * @return string
-	 * @throws Exception When the status is invalid.
 	 */
 	public function update_enhanced_conversion_status( string $status ): string {
 		$status = strtolower( $status );
-		// Ensure that the option belongs to one of the predefined values.
-		if ( ! in_array( $status, [ 'enabled', 'disabled', 'pending' ], true ) ) {
-			throw new Exception( __( 'Invalid state for enhanced conversion', 'google-listings-and-ads' ), 400 );
-		}
 
-		$this->options->update( OptionsInterface::ENHANCED_CONVERSION_STATUS, $status );
+		$this->options->update( OptionsInterface::ADS_ENHANCED_CONVERSION_STATUS, $status );
 
 		return $status;
 	}
@@ -393,8 +388,12 @@ public function update_enhanced_conversion_status( string $status ): string {
 	 * @return string|null
 	 */
 	public function get_enhanced_conversion_status(): ?string {
-		$result = $this->options->get( OptionsInterface::ENHANCED_CONVERSION_STATUS, null );
+		$result = $this->options->get( OptionsInterface::ADS_ENHANCED_CONVERSION_STATUS, null );
+
+		if ( ! is_scalar( $result ) ) {
+			return null;
+		}
 
-		return $result;
+		return strval( $result );
 	}
 }
diff --git a/src/API/Site/Controllers/Ads/AccountController.php b/src/API/Site/Controllers/Ads/AccountController.php
index 4b0b4d5183..a44bdb3694 100644
--- a/src/API/Site/Controllers/Ads/AccountController.php
+++ b/src/API/Site/Controllers/Ads/AccountController.php
@@ -105,6 +105,15 @@ public function register_routes(): void {
 					'methods'             => TransportMethods::EDITABLE,
 					'callback'            => $this->update_enhanced_ads_conversion_callback(),
 					'permission_callback' => $this->get_permission_callback(),
+					'args'                => [
+						'status' => [
+							'description'       => __( 'Enhanced Conversion status.', 'google-listings-and-ads' ),
+							'type'              => 'string',
+							'enum'              => [ 'enabled', 'disabled', 'pending' ],
+							'validate_callback' => 'rest_validate_request_arg',
+							'required'          => true,
+						],
+					],
 				],
 				[
 					'methods'             => TransportMethods::READABLE,
diff --git a/src/Ads/AccountService.php b/src/Ads/AccountService.php
index c9ef7a1510..832356a250 100644
--- a/src/Ads/AccountService.php
+++ b/src/Ads/AccountService.php
@@ -215,10 +215,11 @@ public function disconnect() {
 		$this->options->delete( OptionsInterface::ADS_ACCOUNT_STATE );
 		$this->options->delete( OptionsInterface::ADS_BILLING_URL );
 		$this->options->delete( OptionsInterface::ADS_CONVERSION_ACTION );
+		$this->options->delete( OptionsInterface::ADS_CUSTOMER_DATA_TERMS );
+		$this->options->delete( OptionsInterface::ADS_ENHANCED_CONVERSION_STATUS );
 		$this->options->delete( OptionsInterface::ADS_ID );
 		$this->options->delete( OptionsInterface::ADS_SETUP_COMPLETED_AT );
 		$this->options->delete( OptionsInterface::CAMPAIGN_CONVERT_STATUS );
-		$this->options->delete( OptionsInterface::CUSTOMER_DATA_TERMS );
 		$this->container->get( TransientsInterface::class )->delete( TransientsInterface::ADS_CAMPAIGN_COUNT );
 	}
 
diff --git a/src/Options/OptionsInterface.php b/src/Options/OptionsInterface.php
index 9b7b03c78f..f72e1fe73f 100644
--- a/src/Options/OptionsInterface.php
+++ b/src/Options/OptionsInterface.php
@@ -15,6 +15,8 @@ interface OptionsInterface {
 	public const ADS_ACCOUNT_CURRENCY                      = 'ads_account_currency';
 	public const ADS_ACCOUNT_STATE                         = 'ads_account_state';
 	public const ADS_BILLING_URL                           = 'ads_billing_url';
+	public const ADS_CUSTOMER_DATA_TERMS                   = 'ads_customer_data_terms';
+	public const ADS_ENHANCED_CONVERSION_STATUS            = 'ads_enhanced_conversion_status';
 	public const ADS_ID                                    = 'ads_id';
 	public const ADS_CONVERSION_ACTION                     = 'ads_conversion_action';
 	public const ADS_SETUP_COMPLETED_AT                    = 'ads_setup_completed_at';
@@ -23,7 +25,6 @@ interface OptionsInterface {
 	public const CONTACT_INFO_SETUP                        = 'contact_info_setup';
 	public const DELAYED_ACTIVATE                          = 'delayed_activate';
 	public const DB_VERSION                                = 'db_version';
-	public const ENHANCED_CONVERSION_STATUS                = 'enhanced_conversion_status';
 	public const FILE_VERSION                              = 'file_version';
 	public const GOOGLE_CONNECTED                          = 'google_connected';
 	public const INSTALL_TIMESTAMP                         = 'install_timestamp';
@@ -42,12 +43,13 @@ interface OptionsInterface {
 	public const TOURS                                     = 'tours';
 	public const UPDATE_ALL_PRODUCTS_LAST_SYNC             = 'update_all_products_last_sync';
 	public const WP_TOS_ACCEPTED                           = 'wp_tos_accepted';
-	public const CUSTOMER_DATA_TERMS                       = 'customer_data_terms';
 
 	public const VALID_OPTIONS = [
 		self::ADS_ACCOUNT_CURRENCY                      => true,
 		self::ADS_ACCOUNT_STATE                         => true,
 		self::ADS_BILLING_URL                           => true,
+		self::ADS_CUSTOMER_DATA_TERMS                   => true,
+		self::ADS_ENHANCED_CONVERSION_STATUS            => true,
 		self::ADS_ID                                    => true,
 		self::ADS_CONVERSION_ACTION                     => true,
 		self::ADS_SETUP_COMPLETED_AT                    => true,
@@ -55,7 +57,6 @@ interface OptionsInterface {
 		self::CLAIMED_URL_HASH                          => true,
 		self::CONTACT_INFO_SETUP                        => true,
 		self::DB_VERSION                                => true,
-		self::ENHANCED_CONVERSION_STATUS                => true,
 		self::FILE_VERSION                              => true,
 		self::GOOGLE_CONNECTED                          => true,
 		self::INSTALL_TIMESTAMP                         => true,
@@ -75,7 +76,6 @@ interface OptionsInterface {
 		self::TOURS                                     => true,
 		self::UPDATE_ALL_PRODUCTS_LAST_SYNC             => true,
 		self::WP_TOS_ACCEPTED                           => true,
-		self::CUSTOMER_DATA_TERMS                       => true,
 	];
 
 	public const OPTION_TYPES = [
diff --git a/tests/Unit/API/Google/AdsTest.php b/tests/Unit/API/Google/AdsTest.php
index 2a68e51376..8f9df7a8f0 100644
--- a/tests/Unit/API/Google/AdsTest.php
+++ b/tests/Unit/API/Google/AdsTest.php
@@ -286,23 +286,16 @@ public function test_update_billing_url() {
 	public function test_get_enhanced_conversion_status() {
 		$value = $this->options->expects( $this->once() )
 		->method( 'get' )
-		->with( OptionsInterface::ENHANCED_CONVERSION_STATUS )
+		->with( OptionsInterface::ADS_ENHANCED_CONVERSION_STATUS )
 		->willReturn( 'enabled' );
 
 		$this->assertEquals( 'enabled', $this->ads->get_enhanced_conversion_status() );
 	}
 
-	public function test_update_enhanced_conversion_status_with_invalid_status_throws_exception() {
-		$this->expectException( Exception::class );
-		$this->expectExceptionMessage( 'Invalid state for enhanced conversion' );
-
-		$this->ads->update_enhanced_conversion_status( 'random_status' );
-	}
-
 	public function test_update_enhanced_conversion_status_with_valid_status_returns_status() {
 		$this->options->expects( $this->once() )
 		->method( 'update' )
-		->with( OptionsInterface::ENHANCED_CONVERSION_STATUS )
+		->with( OptionsInterface::ADS_ENHANCED_CONVERSION_STATUS )
 		->willReturn( true );
 
 		// Call with valid status.
diff --git a/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php b/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
index f1414ddd9f..a57db853eb 100644
--- a/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
+++ b/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
@@ -241,6 +241,13 @@ public function test_update_enhanced_conversion_status() {
 		$this->assertEquals( $expected_response, $response->get_data() );
 	}
 
+	public function test_update_enhanced_conversion_status_with_invalid_status() {
+		$response = $this->do_request( self::ROUTE_UPDATED_EC_STATUS, 'POST', [ 'status' => 'invalid' ] );
+
+		$this->assertEquals( 400, $response->get_status() );
+		// $this->assertEquals( $expected_response, $response->get_data() );
+	}
+
 	public function test_get_enhanced_conversion_status() {
 		$expected_response = [ 'status' => 'pending' ];
 		$this->account->expects( $this->once() )
diff --git a/tests/Unit/Ads/AccountServiceTest.php b/tests/Unit/Ads/AccountServiceTest.php
index 68e584779c..5ebf45fd5f 100644
--- a/tests/Unit/Ads/AccountServiceTest.php
+++ b/tests/Unit/Ads/AccountServiceTest.php
@@ -461,17 +461,18 @@ public function test_get_billing_status_pending() {
 	}
 
 	public function test_disconnect() {
-		$this->options->expects( $this->exactly( 8 ) )
+		$this->options->expects( $this->exactly( 9 ) )
 			->method( 'delete' )
 			->withConsecutive(
 				[ OptionsInterface::ADS_ACCOUNT_CURRENCY ],
 				[ OptionsInterface::ADS_ACCOUNT_STATE ],
 				[ OptionsInterface::ADS_BILLING_URL ],
 				[ OptionsInterface::ADS_CONVERSION_ACTION ],
+				[ OptionsInterface::ADS_CUSTOMER_DATA_TERMS ],
+				[ OptionsInterface::ADS_ENHANCED_CONVERSION_STATUS ],
 				[ OptionsInterface::ADS_ID ],
 				[ OptionsInterface::ADS_SETUP_COMPLETED_AT ],
 				[ OptionsInterface::CAMPAIGN_CONVERT_STATUS ],
-				[ OptionsInterface::CUSTOMER_DATA_TERMS ]
 			);
 
 		$this->transients->expects( $this->exactly( 1 ) )

From 4b7def0feab864def827a72841941fb55f84e13d Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Wed, 28 Feb 2024 17:03:02 +0530
Subject: [PATCH 50/95] Fix: phpcs tests

---
 tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php b/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
index a57db853eb..fa03b36a23 100644
--- a/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
+++ b/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
@@ -245,7 +245,6 @@ public function test_update_enhanced_conversion_status_with_invalid_status() {
 		$response = $this->do_request( self::ROUTE_UPDATED_EC_STATUS, 'POST', [ 'status' => 'invalid' ] );
 
 		$this->assertEquals( 400, $response->get_status() );
-		// $this->assertEquals( $expected_response, $response->get_data() );
 	}
 
 	public function test_get_enhanced_conversion_status() {

From 78f67749ad1b8fc6cbf0661acfdb9e597af0cf50 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Fri, 1 Mar 2024 20:10:55 +0400
Subject: [PATCH 51/95] Address code review feedback.

---
 .../cta/index.js                              | 29 +++++++++++++++----
 .../cta/index.test.js                         | 21 +++++++++-----
 .../cta/pending-status.js                     | 12 --------
 .../index.js                                  | 21 ++++++--------
 js/src/data/action-types.js                   |  2 --
 js/src/data/actions.js                        |  4 +--
 js/src/data/reducer.js                        | 16 ++--------
 js/src/data/selectors.js                      |  4 +--
 .../wordpress/guide/index.js                  |  2 +-
 js/src/hooks/useAcceptedCustomerDataTerms.js  |  4 ---
 .../useAcceptedCustomerDataTerms.test.js      |  2 +-
 js/src/hooks/useAdsCampaigns.js               | 12 +++++++-
 js/src/hooks/useAllowEnhancedConversions.js   |  5 +---
 .../hooks/useAllowEnhancedConversions.test.js |  4 +--
 .../useAutoCheckEnhancedConversionTOS.js      | 27 ++++++++++++-----
 .../submission-success-guide/constants.js     |  2 +-
 .../dynamic-screen-content.js                 | 10 ++-----
 .../dynamic-screen-footer.js                  | 18 ++++--------
 .../enhanced-conversion/footer.js             |  9 +++---
 .../enhanced-conversion/footer.test.js        |  6 ++--
 .../google-credits/footer.js                  |  9 +++---
 .../submission-success-guide/index.js         |  8 ++---
 .../submission-success-guide/index.scss       |  6 ++--
 .../submission-success-guide/index.test.js    | 15 ++--------
 .../setup-success/footer.js                   |  5 ++--
 25 files changed, 123 insertions(+), 130 deletions(-)
 delete mode 100644 js/src/components/enhanced-conversion-tracking-settings/cta/pending-status.js

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
index efd9cfd0e9..3563ff479d 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
@@ -16,7 +16,7 @@ import { useAppDispatch } from '.~/data';
 import AppButton from '.~/components/app-button';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
-import PendingStatus from './pending-status';
+import useAutoCheckEnhancedConversionTOS from '.~/hooks/useAutoCheckEnhancedConversionTOS';
 
 const CTA = ( {
 	acceptTermsLabel = __(
@@ -25,16 +25,36 @@ const CTA = ( {
 	),
 	disableLabel = __( 'Disable', 'google-listings-and-ads' ),
 	enableLabel = __( 'Enable', 'google-listings-and-ads' ),
-	onAcceptTermsClick,
 	onEnableClick,
 	onDisableClick,
 } ) => {
+	const {
+		startEnhancedConversionTOSPolling,
+		stopEnhancedConversionTOSPolling,
+	} = useAutoCheckEnhancedConversionTOS();
 	const { updateEnhancedAdsConversionStatus, invalidateResolution } =
 		useAppDispatch();
 	const { acceptedCustomerDataTerms, hasFinishedResolution } =
 		useAcceptedCustomerDataTerms();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 
+	useEffect( () => {
+		if (
+			! acceptedCustomerDataTerms &&
+			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
+		) {
+			startEnhancedConversionTOSPolling();
+			return;
+		}
+
+		stopEnhancedConversionTOSPolling();
+	}, [
+		acceptedCustomerDataTerms,
+		allowEnhancedConversions,
+		startEnhancedConversionTOSPolling,
+		stopEnhancedConversionTOSPolling,
+	] );
+
 	useEffect( () => {
 		if (
 			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
@@ -49,9 +69,7 @@ const CTA = ( {
 		updateEnhancedAdsConversionStatus(
 			ENHANCED_ADS_CONVERSION_STATUS.PENDING
 		);
-
-		onAcceptTermsClick?.();
-	}, [ updateEnhancedAdsConversionStatus, onAcceptTermsClick ] );
+	}, [ updateEnhancedAdsConversionStatus ] );
 
 	const handleDisable = useCallback( () => {
 		if ( ! acceptedCustomerDataTerms ) {
@@ -96,7 +114,6 @@ const CTA = ( {
 		return (
 			<>
 				<AppButton isSecondary disabled loading></AppButton>
-				<PendingStatus />
 			</>
 		);
 	}
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
index d03003960a..e17b2a0373 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
@@ -17,7 +17,15 @@ jest.mock( '.~/hooks/useAllowEnhancedConversions', () => ( {
 
 jest.mock( '.~/hooks/useAutoCheckEnhancedConversionTOS', () => ( {
 	__esModule: true,
-	default: jest.fn().mockName( 'useAutoCheckEnhancedConversionTOS' ),
+	default: jest
+		.fn()
+		.mockName( 'useAutoCheckEnhancedConversionTOS' )
+		.mockImplementation( () => {
+			return {
+				startEnhancedConversionTOSPolling: jest.fn(),
+				stopEnhancedConversionTOSPolling: jest.fn(),
+			};
+		} ),
 } ) );
 
 jest.mock( '.~/data/actions', () => ( {
@@ -137,8 +145,6 @@ describe( 'Enhanced Conversion CTA', () => {
 	} );
 
 	test( 'Click on accept TOS button callback', () => {
-		const handleOnAcceptTerms = jest.fn().mockName( 'On TOS click' );
-
 		window.open = jest.fn();
 
 		useAcceptedCustomerDataTerms.mockReturnValue( {
@@ -152,13 +158,12 @@ describe( 'Enhanced Conversion CTA', () => {
 			isResolving: false,
 		} );
 
-		render( <CTA onAcceptTermsClick={ handleOnAcceptTerms } /> );
+		render( <CTA /> );
 
 		const button = screen.getByRole( 'button' );
 		userEvent.click( button );
 
 		expect( window.open ).toHaveBeenCalledTimes( 1 );
-		expect( handleOnAcceptTerms ).toHaveBeenCalledTimes( 1 );
 	} );
 
 	test( 'Click on enable/confirm button callback', () => {
@@ -249,7 +254,7 @@ describe( 'Enhanced Conversion CTA', () => {
 		expect( handleOnDisable ).not.toHaveBeenCalled();
 	} );
 
-	test( 'Should not the enable button if TOS has been accepted', () => {
+	test( 'Should render the enable button if TOS has been accepted and the status is not enabled', () => {
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: true,
 			isResolving: false,
@@ -263,6 +268,8 @@ describe( 'Enhanced Conversion CTA', () => {
 
 		render( <CTA /> );
 
-		expect( screen.getByText( 'Enable' ) ).toBeInTheDocument();
+		expect(
+			screen.getByRole( 'button', { name: 'Enable' } )
+		).toBeInTheDocument();
 	} );
 } );
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/pending-status.js b/js/src/components/enhanced-conversion-tracking-settings/cta/pending-status.js
deleted file mode 100644
index 3cbcec60d2..0000000000
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/pending-status.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Internal dependencies
- */
-import useAutoCheckEnhancedConversionTOS from '.~/hooks/useAutoCheckEnhancedConversionTOS';
-
-const PendingStatus = () => {
-	useAutoCheckEnhancedConversionTOS();
-
-	return null;
-};
-
-export default PendingStatus;
diff --git a/js/src/components/enhanced-conversion-tracking-settings/index.js b/js/src/components/enhanced-conversion-tracking-settings/index.js
index 2edffea2c2..b46d20c77c 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/index.js
@@ -11,7 +11,6 @@ import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import Section from '.~/wcdl/section';
 import PendingNotice from '.~/components/enhanced-conversion-tracking-settings/pending-notice';
-import VerticalGapLayout from '.~/components/vertical-gap-layout';
 import CTA from './cta';
 
 const DESCRIPTION = (
@@ -38,17 +37,15 @@ const EnhancedConversionTrackingSettings = () => {
 
 	return (
 		<Section title={ TITLE } description={ DESCRIPTION }>
-			<VerticalGapLayout size="large">
-				<Section.Card>
-					<Section.Card.Body>
-						{ allowEnhancedConversions ===
-							ENHANCED_ADS_CONVERSION_STATUS.PENDING &&
-							! acceptedCustomerDataTerms && <PendingNotice /> }
-
-						<CTA />
-					</Section.Card.Body>
-				</Section.Card>
-			</VerticalGapLayout>
+			<Section.Card>
+				<Section.Card.Body>
+					{ allowEnhancedConversions ===
+						ENHANCED_ADS_CONVERSION_STATUS.PENDING &&
+						! acceptedCustomerDataTerms && <PendingNotice /> }
+
+					<CTA />
+				</Section.Card.Body>
+			</Section.Card>
 		</Section>
 	);
 };
diff --git a/js/src/data/action-types.js b/js/src/data/action-types.js
index e26f065407..408b8d91ef 100644
--- a/js/src/data/action-types.js
+++ b/js/src/data/action-types.js
@@ -51,8 +51,6 @@ const TYPES = {
 	HYDRATE_PREFETCHED_DATA: 'HYDRATE_PREFETCHED_DATA',
 	RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS:
 		'RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS',
-	UPDATE_ENHANCED_ADS_CONVERSION_STATUS:
-		'UPDATE_ENHANCED_ADS_CONVERSION_STATUS',
 	RECEIVE_ALLOW_ENHANCED_CONVERSIONS: 'RECEIVE_ALLOW_ENHANCED_CONVERSIONS',
 };
 
diff --git a/js/src/data/actions.js b/js/src/data/actions.js
index 68f0ad3d2b..66e3e44d62 100644
--- a/js/src/data/actions.js
+++ b/js/src/data/actions.js
@@ -1272,8 +1272,8 @@ export function* updateEnhancedAdsConversionStatus( status ) {
 		} );
 
 		return {
-			type: TYPES.UPDATE_ENHANCED_ADS_CONVERSION_STATUS,
-			response,
+			type: TYPES.RECEIVE_ALLOW_ENHANCED_CONVERSIONS,
+			data: response,
 		};
 	} catch ( error ) {
 		handleApiError(
diff --git a/js/src/data/reducer.js b/js/src/data/reducer.js
index f5124e190e..3660047c9e 100644
--- a/js/src/data/reducer.js
+++ b/js/src/data/reducer.js
@@ -509,9 +509,9 @@ const reducer = ( state = DEFAULT_STATE, action ) => {
 			);
 		}
 
-		case TYPES.UPDATE_ENHANCED_ADS_CONVERSION_STATUS: {
+		case TYPES.RECEIVE_ALLOW_ENHANCED_CONVERSIONS: {
 			const {
-				response: { status },
+				data: { status },
 			} = action;
 
 			if ( status === null || status === undefined ) {
@@ -525,18 +525,6 @@ const reducer = ( state = DEFAULT_STATE, action ) => {
 			);
 		}
 
-		case TYPES.RECEIVE_ALLOW_ENHANCED_CONVERSIONS: {
-			const {
-				data: { status },
-			} = action;
-
-			return setIn(
-				state,
-				'ads.conversion_tracking_setting.allow_enhanced_conversions',
-				status
-			);
-		}
-
 		// Page will be reloaded after all accounts have been disconnected, so no need to mutate state.
 		case TYPES.DISCONNECT_ACCOUNTS_ALL:
 		default:
diff --git a/js/src/data/selectors.js b/js/src/data/selectors.js
index eba48c3a5a..ed17eb5d72 100644
--- a/js/src/data/selectors.js
+++ b/js/src/data/selectors.js
@@ -405,7 +405,7 @@ export const getTour = ( state, tourId ) => {
  * Return the customer accepted data terms.
  *
  * @param {Object} state The state
- * @return {boolean} TRUE if the user signed the TOS.
+ * @return {boolean|null} TRUE if the user signed the TOS. It will be `null` if not yet fetched or fetched but doesn't exist.
  */
 export const getAcceptedCustomerDataTerms = ( state ) => {
 	return state.ads.conversion_tracking_setting.accepted_customer_data_terms;
@@ -415,7 +415,7 @@ export const getAcceptedCustomerDataTerms = ( state ) => {
  * Return whether the user allowed enhanced conversion tracking.
  *
  * @param {Object} state The state
- * @return {string} Possible values are 'pending' | 'enabled' | 'disabled'
+ * @return {string|null} Possible values are 'pending' | 'enabled' | 'disabled'. It will be `null` if not yet fetched or fetched but doesn't exist.
  */
 export const getAllowEnhancedConversions = ( state ) => {
 	return state.ads.conversion_tracking_setting.allow_enhanced_conversions;
diff --git a/js/src/external-components/wordpress/guide/index.js b/js/src/external-components/wordpress/guide/index.js
index 5976146ae7..e098a487b1 100644
--- a/js/src/external-components/wordpress/guide/index.js
+++ b/js/src/external-components/wordpress/guide/index.js
@@ -147,7 +147,7 @@ export default function Guide( {
 
 					{ finishBlock }
 
-					{ pages[ currentPage ]?.footer }
+					{ pages[ currentPage ].footer }
 				</div>
 			</div>
 		</Modal>
diff --git a/js/src/hooks/useAcceptedCustomerDataTerms.js b/js/src/hooks/useAcceptedCustomerDataTerms.js
index 99b386805d..5f2507106a 100644
--- a/js/src/hooks/useAcceptedCustomerDataTerms.js
+++ b/js/src/hooks/useAcceptedCustomerDataTerms.js
@@ -12,16 +12,12 @@ const useAcceptedCustomerDataTerms = () => {
 	return useSelect( ( select ) => {
 		const acceptedCustomerDataTerms =
 			select( STORE_KEY ).getAcceptedCustomerDataTerms();
-		const isResolving = select( STORE_KEY ).isResolving(
-			'getAcceptedCustomerDataTerms'
-		);
 		const hasFinishedResolution = select( STORE_KEY ).hasFinishedResolution(
 			'getAcceptedCustomerDataTerms'
 		);
 
 		return {
 			acceptedCustomerDataTerms,
-			isResolving,
 			hasFinishedResolution,
 		};
 	}, [] );
diff --git a/js/src/hooks/useAcceptedCustomerDataTerms.test.js b/js/src/hooks/useAcceptedCustomerDataTerms.test.js
index 4b3d30820d..dfa5ba83a1 100644
--- a/js/src/hooks/useAcceptedCustomerDataTerms.test.js
+++ b/js/src/hooks/useAcceptedCustomerDataTerms.test.js
@@ -18,6 +18,6 @@ describe( 'useAcceptedCustomerDataTerms', () => {
 			return useAcceptedCustomerDataTerms();
 		} );
 
-		expect( result.current.acceptedCustomerDataTerms ).toBeTruthy();
+		expect( result.current.acceptedCustomerDataTerms ).toBe( true );
 	} );
 } );
diff --git a/js/src/hooks/useAdsCampaigns.js b/js/src/hooks/useAdsCampaigns.js
index 5975aec450..dcdf843fd4 100644
--- a/js/src/hooks/useAdsCampaigns.js
+++ b/js/src/hooks/useAdsCampaigns.js
@@ -7,7 +7,7 @@ import { useSelect } from '@wordpress/data';
  * Internal dependencies
  */
 import { STORE_KEY } from '.~/data';
-import { glaData } from '.~/constants';
+import { glaData, CAMPAIGN_TYPE_PMAX } from '.~/constants';
 import useIsEqualRefValue from '.~/hooks/useIsEqualRefValue';
 
 const selectorName = 'getAdsCampaigns';
@@ -44,6 +44,7 @@ const useAdsCampaigns = ( ...query ) => {
 					loading: false,
 					loaded: true,
 					data: [],
+					pmaxCampaigns: [],
 				};
 			}
 
@@ -56,10 +57,19 @@ const useAdsCampaigns = ( ...query ) => {
 				queryRefValue
 			);
 
+			let pmaxCampaigns = [];
+
+			if ( loaded && data.length ) {
+				pmaxCampaigns = data.filter(
+					( { type } ) => type === CAMPAIGN_TYPE_PMAX
+				);
+			}
+
 			return {
 				loading,
 				loaded,
 				data,
+				pmaxCampaigns,
 			};
 		},
 		[ queryRefValue ]
diff --git a/js/src/hooks/useAllowEnhancedConversions.js b/js/src/hooks/useAllowEnhancedConversions.js
index 2d9982eb8d..c132b6af3b 100644
--- a/js/src/hooks/useAllowEnhancedConversions.js
+++ b/js/src/hooks/useAllowEnhancedConversions.js
@@ -12,11 +12,8 @@ const useAllowEnhancedConversions = () => {
 	return useSelect( ( select ) => {
 		const allowEnhancedConversions =
 			select( STORE_KEY ).getAllowEnhancedConversions();
-		const isResolving = select( STORE_KEY ).isResolving(
-			'getAllowEnhancedConversions'
-		);
 
-		return { allowEnhancedConversions, isResolving };
+		return { allowEnhancedConversions };
 	}, [] );
 };
 
diff --git a/js/src/hooks/useAllowEnhancedConversions.test.js b/js/src/hooks/useAllowEnhancedConversions.test.js
index 11113a01ec..aae680ff7b 100644
--- a/js/src/hooks/useAllowEnhancedConversions.test.js
+++ b/js/src/hooks/useAllowEnhancedConversions.test.js
@@ -21,7 +21,7 @@ describe( 'useAllowEnhancedConversions', () => {
 			return useAllowEnhancedConversions();
 		} );
 
-		expect( result.current.allowEnhancedConversions ).toEqual(
+		expect( result.current.allowEnhancedConversions ).toBe(
 			ENHANCED_ADS_CONVERSION_STATUS.ENABLED
 		);
 	} );
@@ -36,7 +36,7 @@ describe( 'useAllowEnhancedConversions', () => {
 			return useAllowEnhancedConversions();
 		} );
 
-		expect( result.current.allowEnhancedConversions ).toEqual(
+		expect( result.current.allowEnhancedConversions ).toBe(
 			ENHANCED_ADS_CONVERSION_STATUS.DISABLED
 		);
 	} );
diff --git a/js/src/hooks/useAutoCheckEnhancedConversionTOS.js b/js/src/hooks/useAutoCheckEnhancedConversionTOS.js
index 6ab285c1d1..476adb3696 100644
--- a/js/src/hooks/useAutoCheckEnhancedConversionTOS.js
+++ b/js/src/hooks/useAutoCheckEnhancedConversionTOS.js
@@ -1,9 +1,8 @@
 /**
  * External dependencies
  */
-import { noop } from 'lodash';
 import { __ } from '@wordpress/i18n';
-import { useCallback, useRef } from '@wordpress/element';
+import { useCallback, useRef, useState } from '@wordpress/element';
 import apiFetch from '@wordpress/api-fetch';
 
 /**
@@ -14,15 +13,25 @@ import { API_NAMESPACE } from '.~/data/constants';
 import useDispatchCoreNotices from '.~/hooks/useDispatchCoreNotices';
 import useWindowFocusCallbackIntervalEffect from '.~/hooks/useWindowFocusCallbackIntervalEffect';
 
-const useAutoCheckEnhancedConversionTOS = ( onStatusAccepted = noop ) => {
+const useAutoCheckEnhancedConversionTOS = () => {
+	const [ polling, setPolling ] = useState( false );
 	const { createNotice } = useDispatchCoreNotices();
 	const { receiveAcceptedTerms } = useAppDispatch();
 	const prevStatusRef = useRef();
 
-	const onStatusAcceptedRef = useRef();
-	onStatusAcceptedRef.current = onStatusAccepted;
+	const startEnhancedConversionTOSPolling = useCallback( () => {
+		setPolling( true );
+	}, [] );
+
+	const stopEnhancedConversionTOSPolling = useCallback( () => {
+		setPolling( false );
+	}, [] );
 
 	const checkStatus = useCallback( async () => {
+		if ( ! polling ) {
+			return;
+		}
+
 		const prevStatus = prevStatusRef.current;
 		const tosStatus = await apiFetch( {
 			path: `${ API_NAMESPACE }/ads/accepted-customer-data-terms`,
@@ -37,7 +46,6 @@ const useAutoCheckEnhancedConversionTOS = ( onStatusAccepted = noop ) => {
 		}
 
 		try {
-			await onStatusAcceptedRef.current();
 			receiveAcceptedTerms( tosStatus );
 		} catch ( e ) {
 			createNotice(
@@ -48,9 +56,14 @@ const useAutoCheckEnhancedConversionTOS = ( onStatusAccepted = noop ) => {
 				)
 			);
 		}
-	}, [ receiveAcceptedTerms, createNotice ] );
+	}, [ receiveAcceptedTerms, createNotice, polling ] );
 
 	useWindowFocusCallbackIntervalEffect( checkStatus, 30 );
+
+	return {
+		startEnhancedConversionTOSPolling,
+		stopEnhancedConversionTOSPolling,
+	};
 };
 
 export default useAutoCheckEnhancedConversionTOS;
diff --git a/js/src/product-feed/submission-success-guide/constants.js b/js/src/product-feed/submission-success-guide/constants.js
index a99859cb82..dde7b88d45 100644
--- a/js/src/product-feed/submission-success-guide/constants.js
+++ b/js/src/product-feed/submission-success-guide/constants.js
@@ -1 +1 @@
-export const EVENT_NAME = 'gla_modal_closed';
+export const GLA_MODAL_CLOSED_EVENT_NAME = 'gla_modal_closed';
diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-content.js b/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
index 6a7f35ed4b..6c403edaba 100644
--- a/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
@@ -6,7 +6,7 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { CAMPAIGN_TYPE_PMAX, glaData } from '.~/constants';
+import { glaData } from '.~/constants';
 import LoadingLabel from '.~/components/loading-label';
 import GuidePageContent from '.~/components/guide-page-content';
 import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
@@ -14,13 +14,9 @@ import EnhancedConversion from './enhanced-conversion';
 import GoogleCredits from './google-credits';
 
 const DynamicScreenContent = () => {
-	const { data: campaigns, loading: adsCampaignsLoading } = useAdsCampaigns();
+	const { loaded, pmaxCampaigns } = useAdsCampaigns();
 
-	const pmaxCampaigns = campaigns?.filter(
-		( { type } ) => type === CAMPAIGN_TYPE_PMAX
-	);
-
-	if ( adsCampaignsLoading ) {
+	if ( ! loaded ) {
 		return (
 			<GuidePageContent
 				title={ __( 'Please wait', 'google-listings-and-ads' ) }
diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js b/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
index 4e8ea0dd74..d83519e35c 100644
--- a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
@@ -6,20 +6,16 @@ import { Fragment } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { CAMPAIGN_TYPE_PMAX, glaData } from '.~/constants';
+import { glaData } from '.~/constants';
 import LoadingLabel from '.~/components/loading-label';
 import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
 import EnhancedConversionFooter from './enhanced-conversion/footer';
 import GoogleCreditsFooter from './google-credits/footer';
 
-const DynamicScreenFooter = ( { handleGuideFinish } ) => {
-	const { data: campaigns, loading: adsCampaignsLoading } = useAdsCampaigns();
+const DynamicScreenFooter = ( { onClose } ) => {
+	const { loaded, pmaxCampaigns } = useAdsCampaigns();
 
-	const pmaxCampaigns = campaigns?.filter(
-		( { type } ) => type === CAMPAIGN_TYPE_PMAX
-	);
-
-	if ( adsCampaignsLoading ) {
+	if ( ! loaded ) {
 		return (
 			<Fragment>
 				<div className="gla-submission-success-guide__space_holder" />
@@ -29,12 +25,10 @@ const DynamicScreenFooter = ( { handleGuideFinish } ) => {
 	}
 
 	if ( pmaxCampaigns?.length && glaData.adsConnected ) {
-		return (
-			<EnhancedConversionFooter handleGuideFinish={ handleGuideFinish } />
-		);
+		return <EnhancedConversionFooter onClose={ onClose } />;
 	}
 
-	return <GoogleCreditsFooter handleGuideFinish={ handleGuideFinish } />;
+	return <GoogleCreditsFooter onClose={ onClose } />;
 };
 
 export default DynamicScreenFooter;
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.js
index 504347191c..81b064613e 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.js
@@ -3,6 +3,7 @@
  */
 import { __ } from '@wordpress/i18n';
 import { useCallback, Fragment } from '@wordpress/element';
+import noop from 'lodash/noop';
 
 /**
  * Internal dependencies
@@ -11,7 +12,7 @@ import useDispatchCoreNotices from '.~/hooks/useDispatchCoreNotices';
 import AppButton from '.~/components/app-button';
 import CTA from '.~/components/enhanced-conversion-tracking-settings/cta';
 
-const Footer = ( { handleGuideFinish } ) => {
+const Footer = ( { onClose = noop } ) => {
 	const { createNotice } = useDispatchCoreNotices();
 
 	const handleEnableOrDisableClick = useCallback( () => {
@@ -20,8 +21,8 @@ const Footer = ( { handleGuideFinish } ) => {
 			__( 'Status successfully set', 'google-listings-and-ads' )
 		);
 
-		handleGuideFinish?.();
-	}, [ createNotice, handleGuideFinish ] );
+		onClose();
+	}, [ createNotice, onClose ] );
 
 	return (
 		<Fragment>
@@ -31,7 +32,7 @@ const Footer = ( { handleGuideFinish } ) => {
 				isSecondary
 				// @todo: review data-action label
 				data-action="view-product-feed"
-				onClick={ handleGuideFinish }
+				onClick={ onClose }
 			>
 				{ __( 'Close', 'google-listings-and-ads' ) }
 			</AppButton>
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
index c25285b7de..ec8e078ec6 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
@@ -69,7 +69,7 @@ describe( 'Enhanced Conversion Footer', () => {
 	} );
 
 	test( 'Click on enable/disable button callback', () => {
-		const handleGuideFinish = jest.fn().mockName( 'On button click' );
+		const handleOnClose = jest.fn().mockName( 'On button click' );
 
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: true,
@@ -81,11 +81,11 @@ describe( 'Enhanced Conversion Footer', () => {
 			isResolving: false,
 		} );
 
-		render( <Footer handleGuideFinish={ handleGuideFinish } /> );
+		render( <Footer onClose={ handleOnClose } /> );
 
 		const button = screen.getByRole( 'button', { name: 'Confirm' } );
 		userEvent.click( button );
 
-		expect( handleGuideFinish ).toHaveBeenCalledTimes( 1 );
+		expect( handleOnClose ).toHaveBeenCalledTimes( 1 );
 	} );
 } );
diff --git a/js/src/product-feed/submission-success-guide/google-credits/footer.js b/js/src/product-feed/submission-success-guide/google-credits/footer.js
index 8bfcb40104..e49cad2497 100644
--- a/js/src/product-feed/submission-success-guide/google-credits/footer.js
+++ b/js/src/product-feed/submission-success-guide/google-credits/footer.js
@@ -3,16 +3,17 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Fragment } from '@wordpress/element';
+import noop from 'lodash/noop';
 
 /**
  * Internal dependencies
  */
 import { GUIDE_NAMES } from '.~/constants';
-import { EVENT_NAME } from '../constants';
+import { GLA_MODAL_CLOSED_EVENT_NAME } from '../constants';
 import AppButton from '.~/components/app-button';
 import AddPaidCampaignButton from '.~/components/paid-ads/add-paid-campaign-button';
 
-const Footer = ( { handleGuideFinish } ) => {
+const Footer = ( { onClose = noop } ) => {
 	return (
 		<Fragment>
 			<div className="gla-submission-success-guide__space_holder" />
@@ -20,7 +21,7 @@ const Footer = ( { handleGuideFinish } ) => {
 			<AppButton
 				isSecondary
 				data-action="maybe-later"
-				onClick={ handleGuideFinish }
+				onClick={ onClose }
 			>
 				{ __( 'Maybe later', 'google-listings-and-ads' ) }
 			</AppButton>
@@ -29,7 +30,7 @@ const Footer = ( { handleGuideFinish } ) => {
 				isPrimary
 				isSecondary={ false }
 				isSmall={ false }
-				eventName={ EVENT_NAME }
+				eventName={ GLA_MODAL_CLOSED_EVENT_NAME }
 				eventProps={ {
 					context: GUIDE_NAMES.SUBMISSION_SUCCESS,
 					action: 'create-paid-campaign',
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index 06c2ba2704..dacef42707 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -11,7 +11,7 @@ import { getHistory } from '@woocommerce/navigation';
 import { glaData, GUIDE_NAMES, LOCAL_STORAGE_KEYS } from '.~/constants';
 import { getProductFeedUrl } from '.~/utils/urls';
 import { recordGlaEvent } from '.~/utils/tracks';
-import { EVENT_NAME } from './constants';
+import { GLA_MODAL_CLOSED_EVENT_NAME } from './constants';
 import Guide from '.~/external-components/wordpress/guide';
 import localStorage from '.~/utils/localStorage';
 import DynamicScreenContent from './dynamic-screen-content';
@@ -51,7 +51,7 @@ const handleGuideFinish = ( e ) => {
 	// here is a workaround by identifying the close button's data-aciton attribute.
 	const target = e.currentTarget || e.target;
 	const action = target.dataset.action || 'dismiss';
-	recordGlaEvent( EVENT_NAME, {
+	recordGlaEvent( GLA_MODAL_CLOSED_EVENT_NAME, {
 		context: GUIDE_NAMES.SUBMISSION_SUCCESS,
 		action,
 	} );
@@ -61,12 +61,12 @@ const pages = [
 	{
 		image,
 		content: <SetupSuccess />,
-		footer: <SetupSuccessFooter handleGuideFinish={ handleGuideFinish } />,
+		footer: <SetupSuccessFooter onClose={ handleGuideFinish } />,
 	},
 	{
 		image,
 		content: <DynamicScreenContent />,
-		footer: <DynamicScreenFooter handleGuideFinish={ handleGuideFinish } />,
+		footer: <DynamicScreenFooter onClose={ handleGuideFinish } />,
 	},
 ];
 
diff --git a/js/src/product-feed/submission-success-guide/index.scss b/js/src/product-feed/submission-success-guide/index.scss
index 477969c24c..207ea73f77 100644
--- a/js/src/product-feed/submission-success-guide/index.scss
+++ b/js/src/product-feed/submission-success-guide/index.scss
@@ -1,6 +1,8 @@
 .gla-submission-success-guide {
 	&.components-guide {
 		height: auto;
+		width: 100%;
+
 		@include break-small {
 			max-width: 517px;
 			max-height: none;
@@ -122,8 +124,4 @@
 	&__space_holder {
 		flex: 1 1 0;
 	}
-
-	.screen-content--loading {
-		min-width: 469px;
-	}
 }
diff --git a/js/src/product-feed/submission-success-guide/index.test.js b/js/src/product-feed/submission-success-guide/index.test.js
index 083e8876f5..dde91edb04 100644
--- a/js/src/product-feed/submission-success-guide/index.test.js
+++ b/js/src/product-feed/submission-success-guide/index.test.js
@@ -28,7 +28,7 @@ import SubmissionSuccessGuide from './index';
 import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
 import { CAMPAIGN_TYPE_PMAX } from '.~/constants';
 
-const PAID_CAMPAIGN = {
+const PMAX_CAMPAIGN = {
 	id: 10,
 	name: 'PMax Campaign',
 	status: 'enabled',
@@ -37,15 +37,6 @@ const PAID_CAMPAIGN = {
 	displayCountries: [ 'US' ],
 };
 
-const FREE_CAMPAIGN = {
-	id: 11,
-	name: 'Free Campaign',
-	status: 'enabled',
-	type: 'shopping',
-	amount: 30,
-	displayCountries: [ 'US' ],
-};
-
 describe( 'SubmissionSuccessGuide', () => {
 	beforeEach( () => {
 		jest.clearAllMocks();
@@ -53,7 +44,7 @@ describe( 'SubmissionSuccessGuide', () => {
 
 	test( 'Renders the Google Ads credit screen if there are no paid campaigns', () => {
 		useAdsCampaigns.mockReturnValue( {
-			data: [ FREE_CAMPAIGN ],
+			pmaxCampaigns: [],
 			loaded: true,
 		} );
 
@@ -69,7 +60,7 @@ describe( 'SubmissionSuccessGuide', () => {
 
 	test( 'Renders the enhanced tracking screen if there are paid campaigns', () => {
 		useAdsCampaigns.mockReturnValue( {
-			data: [ PAID_CAMPAIGN ],
+			pmaxCampaigns: [ PMAX_CAMPAIGN ],
 			loaded: true,
 		} );
 
diff --git a/js/src/product-feed/submission-success-guide/setup-success/footer.js b/js/src/product-feed/submission-success-guide/setup-success/footer.js
index 442e7486c8..065635319f 100644
--- a/js/src/product-feed/submission-success-guide/setup-success/footer.js
+++ b/js/src/product-feed/submission-success-guide/setup-success/footer.js
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
+import noop from 'lodash/noop';
 
 /**
  * Internal dependencies
@@ -9,7 +10,7 @@ import { __ } from '@wordpress/i18n';
 import { glaData } from '.~/constants';
 import AppButton from '.~/components/app-button';
 
-const Footer = ( { handleGuideFinish } ) => {
+const Footer = ( { onClose = noop } ) => {
 	if ( glaData.adsConnected ) {
 		return null;
 	}
@@ -18,7 +19,7 @@ const Footer = ( { handleGuideFinish } ) => {
 		<AppButton
 			isPrimary
 			data-action="view-product-feed"
-			onClick={ handleGuideFinish }
+			onClick={ onClose }
 		>
 			{ __( 'View product feed', 'google-listings-and-ads' ) }
 		</AppButton>

From 6d1c4b2c243c214437d68991ddaf0fa4d4d3438d Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Mon, 4 Mar 2024 18:37:43 +0400
Subject: [PATCH 52/95] Add test for disabled button.

---
 .../index.js                                  |  2 +-
 .../dynamic-screen-content.js                 |  2 +-
 .../dynamic-screen-footer.js                  |  2 +-
 .../enhanced-conversion/footer.test.js        | 23 ++++++++++++++++++-
 .../submission-success-guide/index.js         |  2 +-
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/index.js b/js/src/components/enhanced-conversion-tracking-settings/index.js
index b46d20c77c..5f89437a26 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/index.js
@@ -31,7 +31,7 @@ const EnhancedConversionTrackingSettings = () => {
 	const { acceptedCustomerDataTerms } = useAcceptedCustomerDataTerms();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 
-	if ( ! glaData.adsConnected ) {
+	if ( ! glaData.initialWpData.adsId ) {
 		return null;
 	}
 
diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-content.js b/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
index 6c403edaba..66f789cbb6 100644
--- a/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
@@ -28,7 +28,7 @@ const DynamicScreenContent = () => {
 		);
 	}
 
-	if ( pmaxCampaigns?.length && glaData.adsConnected ) {
+	if ( pmaxCampaigns.length && glaData.initialWpData.adsId ) {
 		return <EnhancedConversion />;
 	}
 
diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js b/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
index d83519e35c..3c49d3cc5c 100644
--- a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
@@ -24,7 +24,7 @@ const DynamicScreenFooter = ( { onClose } ) => {
 		);
 	}
 
-	if ( pmaxCampaigns?.length && glaData.adsConnected ) {
+	if ( pmaxCampaigns.length && glaData.initialWpData.adsId ) {
 		return <EnhancedConversionFooter onClose={ onClose } />;
 	}
 
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
index ec8e078ec6..7263264237 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
@@ -68,7 +68,7 @@ describe( 'Enhanced Conversion Footer', () => {
 		).toBeInTheDocument();
 	} );
 
-	test( 'Click on enable/disable button callback', () => {
+	test( 'Click on enable button callback', () => {
 		const handleOnClose = jest.fn().mockName( 'On button click' );
 
 		useAcceptedCustomerDataTerms.mockReturnValue( {
@@ -88,4 +88,25 @@ describe( 'Enhanced Conversion Footer', () => {
 
 		expect( handleOnClose ).toHaveBeenCalledTimes( 1 );
 	} );
+
+	test( 'Click on disable button callback', () => {
+		const handleOnClose = jest.fn().mockName( 'On button click' );
+
+		useAcceptedCustomerDataTerms.mockReturnValue( {
+			acceptedCustomerDataTerms: true,
+			isResolving: false,
+			hasFinishedResolution: true,
+		} );
+		useAllowEnhancedConversions.mockReturnValue( {
+			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.ENABLED,
+			isResolving: false,
+		} );
+
+		render( <Footer onClose={ handleOnClose } /> );
+
+		const button = screen.getByRole( 'button', { name: 'Disable' } );
+		userEvent.click( button );
+
+		expect( handleOnClose ).toHaveBeenCalledTimes( 1 );
+	} );
 } );
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index dacef42707..c47360c0ba 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -70,7 +70,7 @@ const pages = [
 	},
 ];
 
-if ( ! glaData.adsConnected ) {
+if ( ! glaData.initialWpData.adsId ) {
 	pages.pop();
 }
 

From 85e005a1f0e380c35c24ff4fb8028e3de3dbb5ee Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Mon, 4 Mar 2024 20:12:44 +0530
Subject: [PATCH 53/95] Conditionally add enhanced conversion event

---
 src/Google/GlobalSiteTag.php | 139 ++++++++++++++++++++++-------------
 1 file changed, 86 insertions(+), 53 deletions(-)

diff --git a/src/Google/GlobalSiteTag.php b/src/Google/GlobalSiteTag.php
index 71687fab0b..50e0427abc 100644
--- a/src/Google/GlobalSiteTag.php
+++ b/src/Google/GlobalSiteTag.php
@@ -24,6 +24,7 @@
 use Automattic\WooCommerce\GoogleListingsAndAds\Proxies\WP;
 use Automattic\WooCommerce\GoogleListingsAndAds\Value\BuiltScriptDependencyArray;
 use WC_Product;
+use WC_Customer;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -217,12 +218,13 @@ function () use ( $gtag_events ) {
 	 */
 	public function activate_global_site_tag( string $ads_conversion_id ) {
 		if ( $this->gtag_js->is_adding_framework() ) {
+			$config = wp_json_encode( $this->get_config_object() );
 			add_filter(
 				'woocommerce_gtag_snippet',
-				function ( $gtag_snippet ) use ( $ads_conversion_id ) {
+				function ( $gtag_snippet ) use ( $ads_conversion_id, $config ) {
 					return preg_replace(
 						'~(\s)</script>~',
-						"\tgtag('config', '" . $ads_conversion_id . "', { 'groups': 'GLA', 'send_page_view': false });\n$1</script>",
+						"\tgtag('config', '" . $ads_conversion_id . "', $config);\n$1</script>",
 						$gtag_snippet
 					);
 				}
@@ -238,6 +240,7 @@ function ( $gtag_snippet ) use ( $ads_conversion_id ) {
 	 * @param string $ads_conversion_id Google Ads account conversion ID.
 	 */
 	protected function display_global_site_tag( string $ads_conversion_id ) {
+		$config = $this->get_config_object();
 		// phpcs:disable WordPress.WP.EnqueuedResources.NonEnqueuedScript
 		?>
 
@@ -249,10 +252,7 @@ function gtag() { dataLayer.push(arguments); }
 
 			gtag('js', new Date());
 			gtag('set', 'developer_id.<?php echo esc_js( self::DEVELOPER_ID ); ?>', true);
-			gtag('config', '<?php echo esc_js( $ads_conversion_id ); ?>', {
-				'groups': 'GLA',
-				'send_page_view': false
-			});
+			gtag('config', '<?php echo esc_js( $ads_conversion_id ); ?>', <?php echo wp_json_encode( $config ); // phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped ?>);
 		</script>
 
 		<?php
@@ -357,62 +357,64 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 		);
 		wp_print_inline_script_tag( $purchase_page_gtag );
 
-		// Enhanced conversion data.
-		$ec_data         = [];
-		$customer        = new WC_Customer( $order->get_customer_id() );
-		$email           = $customer->get_billing_email();
-		$fname           = $customer->get_billing_first_name();
-		$lname           = $customer->get_billing_last_name();
-		$phone           = $customer->get_billing_phone();
-		$billing_address = $customer->get_billing_address();
-		$postcode        = $customer->get_billing_postcode();
-		$city            = $customer->get_billing_city();
-		$region          = $customer->get_billing_state();
-		$country         = $customer->get_billing_country();
-
-		// Add email in EC data.
-		if ( ! empty( $email ) ) {
-			$ec_data['email'] = $email;
-		}
+		if ( $this->is_enhanced_conversion_enabled() ) {
+			// Enhanced conversion data.
+			$ec_data         = [];
+			$customer        = new WC_Customer( $order->get_customer_id() );
+			$email           = $customer->get_billing_email();
+			$fname           = $customer->get_billing_first_name();
+			$lname           = $customer->get_billing_last_name();
+			$phone           = $customer->get_billing_phone();
+			$billing_address = $customer->get_billing_address();
+			$postcode        = $customer->get_billing_postcode();
+			$city            = $customer->get_billing_city();
+			$region          = $customer->get_billing_state();
+			$country         = $customer->get_billing_country();
+
+			// Add email in EC data.
+			if ( ! empty( $email ) ) {
+				$ec_data['email'] = $email;
+			}
 
-		// Format phone number in IE64.
-		$phone        = preg_replace( '/[^0-9]/', '', $phone );
-		$phone_length = strlen( $phone );
-		if ( $phone_length > 9 && $phone_length < 14 ) {
-			$phone            = sprintf( '%s%d', '+', $phone );
-			$ec_data['phone_number'] = $phone;
-		}
+			// Format phone number in IE64.
+			$phone        = preg_replace( '/[^0-9]/', '', $phone );
+			$phone_length = strlen( $phone );
+			if ( $phone_length > 9 && $phone_length < 14 ) {
+				$phone                   = sprintf( '%s%d', '+', $phone );
+				$ec_data['phone_number'] = $phone;
+			}
 
-		// Check for required address fields.
-		if ( ! empty( $fname ) && ! empty( $lname ) && ! empty( $postcode ) && ! empty( $country ) ) {
-			$ec_data['address']['first_name']  = $fname;
-			$ec_data['address']['last_name']   = $lname;
-			$ec_data['address']['postal_code'] = $postcode;
-			$ec_data['address']['country']     = $country;
+			// Check for required address fields.
+			if ( ! empty( $fname ) && ! empty( $lname ) && ! empty( $postcode ) && ! empty( $country ) ) {
+				$ec_data['address']['first_name']  = $fname;
+				$ec_data['address']['last_name']   = $lname;
+				$ec_data['address']['postal_code'] = $postcode;
+				$ec_data['address']['country']     = $country;
 
-			/**
-			 * Add additional data, if present.
-			 */
+				/**
+				 * Add additional data, if present.
+				 */
 
-			// Add street address.
-			if ( ! empty( $billing_address ) ) {
-				$ec_data['address']['street'] = $billing_address;
-			}
+				// Add street address.
+				if ( ! empty( $billing_address ) ) {
+					$ec_data['address']['street'] = $billing_address;
+				}
 
-			// Add city.
-			if ( ! empty( $city ) ) {
-				$ec_data['address']['city'] = $city;
-			}
+				// Add city.
+				if ( ! empty( $city ) ) {
+					$ec_data['address']['city'] = $city;
+				}
 
-			// Add region.
-			if ( ! empty( $region ) ) {
-				$ec_data['address']['region'] = $region;
+				// Add region.
+				if ( ! empty( $region ) ) {
+					$ec_data['address']['region'] = $region;
+				}
 			}
-		}
 
-		$purchase_user_data_gtag = sprintf( 'gtag("set", "user_data", %s)', wp_json_encode( $ec_data ) );
+			$purchase_user_data_gtag = sprintf( 'gtag("set", "user_data", %s)', wp_json_encode( $ec_data ) );
 
-		wp_print_inline_script_tag( $purchase_user_data_gtag );
+			wp_print_inline_script_tag( $purchase_user_data_gtag );
+		}
 	}
 
 	/**
@@ -578,4 +580,35 @@ private function register_js_for_fast_refresh_dev() {
 			false
 		);
 	}
+
+	/**
+	 * Get the config object for Google tag.
+	 *
+	 * @return array
+	 */
+	private function get_config_object(): array {
+		// Standard config.
+		$config = [
+			'groups'         => 'GLA',
+			'send_page_view' => false,
+		];
+
+		// Check if enhanced conversion is enabled.
+		if ( $this->is_enhanced_conversion_enabled() ) {
+			$config['allow_enhanced_conversions'] = true;
+		}
+
+		return $config;
+	}
+
+	/**
+	 * Checks if enhanced conversion is enabled.
+	 *
+	 * @return bool
+	 */
+	private function is_enhanced_conversion_enabled(): bool {
+		// Check if enhanced conversion is enabled.
+		$enhanced_conversion_status = $this->options->get( OptionsInterface::ADS_ENHANCED_CONVERSION_STATUS, null );
+		return ( 'enabled' === $enhanced_conversion_status );
+	}
 }

From 1920f47f24b354a2f62b694da511d105b6ae13bf Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Mon, 4 Mar 2024 18:50:12 +0400
Subject: [PATCH 54/95] Add adsId property.

---
 jest.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jest.config.js b/jest.config.js
index 66ef3cadd0..bc33eabe89 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -53,6 +53,7 @@ module.exports = {
 			timeFormat: 'g:i a',
 			initialWpData: {
 				version: '1.2.3',
+				adsId: '12345',
 			},
 		},
 	},

From b43997b966227069fd63f4e63bb6d2ca93723516 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Mon, 4 Mar 2024 20:26:15 +0530
Subject: [PATCH 55/95] Normalize and hash data

---
 src/Google/GlobalSiteTag.php | 40 ++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/Google/GlobalSiteTag.php b/src/Google/GlobalSiteTag.php
index 50e0427abc..67177071f0 100644
--- a/src/Google/GlobalSiteTag.php
+++ b/src/Google/GlobalSiteTag.php
@@ -373,7 +373,7 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 
 			// Add email in EC data.
 			if ( ! empty( $email ) ) {
-				$ec_data['email'] = $email;
+				$ec_data['email'] = $this->normalize_and_hash( $email );
 			}
 
 			// Format phone number in IE64.
@@ -381,15 +381,15 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 			$phone_length = strlen( $phone );
 			if ( $phone_length > 9 && $phone_length < 14 ) {
 				$phone                   = sprintf( '%s%d', '+', $phone );
-				$ec_data['phone_number'] = $phone;
+				$ec_data['phone_number'] = $this->normalize_and_hash( $phone );
 			}
 
 			// Check for required address fields.
 			if ( ! empty( $fname ) && ! empty( $lname ) && ! empty( $postcode ) && ! empty( $country ) ) {
-				$ec_data['address']['first_name']  = $fname;
-				$ec_data['address']['last_name']   = $lname;
-				$ec_data['address']['postal_code'] = $postcode;
-				$ec_data['address']['country']     = $country;
+				$ec_data['address']['first_name']  = $this->normalize_and_hash( $fname );
+				$ec_data['address']['last_name']   = $this->normalize_and_hash( $lname );
+				$ec_data['address']['postal_code'] = $this->normalize_and_hash( $postcode );
+				$ec_data['address']['country']     = $this->normalize_and_hash( $country );
 
 				/**
 				 * Add additional data, if present.
@@ -397,17 +397,17 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 
 				// Add street address.
 				if ( ! empty( $billing_address ) ) {
-					$ec_data['address']['street'] = $billing_address;
+					$ec_data['address']['street'] = $this->normalize_and_hash( $billing_address );
 				}
 
 				// Add city.
 				if ( ! empty( $city ) ) {
-					$ec_data['address']['city'] = $city;
+					$ec_data['address']['city'] = $this->normalize_and_hash( $city );
 				}
 
 				// Add region.
 				if ( ! empty( $region ) ) {
-					$ec_data['address']['region'] = $region;
+					$ec_data['address']['region'] = $this->normalize_and_hash( $region );
 				}
 			}
 
@@ -611,4 +611,26 @@ private function is_enhanced_conversion_enabled(): bool {
 		$enhanced_conversion_status = $this->options->get( OptionsInterface::ADS_ENHANCED_CONVERSION_STATUS, null );
 		return ( 'enabled' === $enhanced_conversion_status );
 	}
+
+	/**
+	 * Return the hashed data to be sent to Google ads for enhanced conversion.
+	 *
+	 * @param string $value Data that needs to be hashed.
+	 * @param string $algo  Algorithm for hashing.
+	 *
+	 * @return string
+	 */
+	private function normalize_and_hash( string $value, $algo = '256' ): string {
+		if ( empty( $value ) ) {
+			return '';
+		}
+
+		// Remove leading and trailing whitespaces.
+		$value = trim( $value );
+
+		// Convert case to lowercase.
+		$value = strtolower( $value );
+
+		return hash( $algo, $value );
+	}
 }

From 365139c6ef5e15c25f0772b1a84adea407f20488 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Mon, 4 Mar 2024 21:39:23 +0530
Subject: [PATCH 56/95] Fix: algo name

---
 src/Google/GlobalSiteTag.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Google/GlobalSiteTag.php b/src/Google/GlobalSiteTag.php
index 67177071f0..cc38903d7f 100644
--- a/src/Google/GlobalSiteTag.php
+++ b/src/Google/GlobalSiteTag.php
@@ -620,7 +620,7 @@ private function is_enhanced_conversion_enabled(): bool {
 	 *
 	 * @return string
 	 */
-	private function normalize_and_hash( string $value, $algo = '256' ): string {
+	private function normalize_and_hash( string $value, $algo = 'sha256' ): string {
 		if ( empty( $value ) ) {
 			return '';
 		}

From db349d272ac17c91ab7a00df926b82b99d995f26 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Wed, 6 Mar 2024 15:02:20 +0400
Subject: [PATCH 57/95] Revert to adsConnected property.

---
 jest.config.js                                                  | 1 -
 .../components/enhanced-conversion-tracking-settings/index.js   | 2 +-
 .../submission-success-guide/dynamic-screen-content.js          | 2 +-
 .../submission-success-guide/dynamic-screen-footer.js           | 2 +-
 js/src/product-feed/submission-success-guide/index.js           | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index bc33eabe89..66ef3cadd0 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -53,7 +53,6 @@ module.exports = {
 			timeFormat: 'g:i a',
 			initialWpData: {
 				version: '1.2.3',
-				adsId: '12345',
 			},
 		},
 	},
diff --git a/js/src/components/enhanced-conversion-tracking-settings/index.js b/js/src/components/enhanced-conversion-tracking-settings/index.js
index 5f89437a26..b46d20c77c 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/index.js
@@ -31,7 +31,7 @@ const EnhancedConversionTrackingSettings = () => {
 	const { acceptedCustomerDataTerms } = useAcceptedCustomerDataTerms();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 
-	if ( ! glaData.initialWpData.adsId ) {
+	if ( ! glaData.adsConnected ) {
 		return null;
 	}
 
diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-content.js b/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
index 66f789cbb6..b1d525276c 100644
--- a/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
@@ -28,7 +28,7 @@ const DynamicScreenContent = () => {
 		);
 	}
 
-	if ( pmaxCampaigns.length && glaData.initialWpData.adsId ) {
+	if ( pmaxCampaigns.length && glaData.adsConnected ) {
 		return <EnhancedConversion />;
 	}
 
diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js b/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
index 3c49d3cc5c..828ae9e29d 100644
--- a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
@@ -24,7 +24,7 @@ const DynamicScreenFooter = ( { onClose } ) => {
 		);
 	}
 
-	if ( pmaxCampaigns.length && glaData.initialWpData.adsId ) {
+	if ( pmaxCampaigns.length && glaData.adsConnected ) {
 		return <EnhancedConversionFooter onClose={ onClose } />;
 	}
 
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index c0a0c25d0d..c52ddee98c 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -74,7 +74,7 @@ const pages = [
 	},
 ];
 
-if ( ! glaData.initialWpData.adsId ) {
+if ( ! glaData.adsConnected ) {
 	pages.pop();
 }
 

From 060aaacbeee44e8026eae6a8310fa3f506c5c09d Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Wed, 6 Mar 2024 15:19:08 +0400
Subject: [PATCH 58/95] Rename prop from onClose to onModalClose.

---
 .../dynamic-screen-footer.js                         |  7 ++++---
 .../enhanced-conversion/footer.js                    | 10 +++++-----
 .../enhanced-conversion/footer.test.js               | 12 ++++++------
 .../google-credits/footer.js                         |  6 +++---
 .../product-feed/submission-success-guide/index.js   |  4 ++--
 .../submission-success-guide/setup-success/footer.js |  6 +++---
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js b/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
index 828ae9e29d..428d0b7a07 100644
--- a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import { Fragment } from '@wordpress/element';
+import { noop } from 'lodash';
 
 /**
  * Internal dependencies
@@ -12,7 +13,7 @@ import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
 import EnhancedConversionFooter from './enhanced-conversion/footer';
 import GoogleCreditsFooter from './google-credits/footer';
 
-const DynamicScreenFooter = ( { onClose } ) => {
+const DynamicScreenFooter = ( { onModalClose = noop } ) => {
 	const { loaded, pmaxCampaigns } = useAdsCampaigns();
 
 	if ( ! loaded ) {
@@ -25,10 +26,10 @@ const DynamicScreenFooter = ( { onClose } ) => {
 	}
 
 	if ( pmaxCampaigns.length && glaData.adsConnected ) {
-		return <EnhancedConversionFooter onClose={ onClose } />;
+		return <EnhancedConversionFooter onModalClose={ onModalClose } />;
 	}
 
-	return <GoogleCreditsFooter onClose={ onClose } />;
+	return <GoogleCreditsFooter onModalClose={ onModalClose } />;
 };
 
 export default DynamicScreenFooter;
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.js
index 81b064613e..cb10810f9e 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.js
@@ -3,7 +3,7 @@
  */
 import { __ } from '@wordpress/i18n';
 import { useCallback, Fragment } from '@wordpress/element';
-import noop from 'lodash/noop';
+import { noop } from 'lodash';
 
 /**
  * Internal dependencies
@@ -12,7 +12,7 @@ import useDispatchCoreNotices from '.~/hooks/useDispatchCoreNotices';
 import AppButton from '.~/components/app-button';
 import CTA from '.~/components/enhanced-conversion-tracking-settings/cta';
 
-const Footer = ( { onClose = noop } ) => {
+const Footer = ( { onModalClose = noop } ) => {
 	const { createNotice } = useDispatchCoreNotices();
 
 	const handleEnableOrDisableClick = useCallback( () => {
@@ -21,8 +21,8 @@ const Footer = ( { onClose = noop } ) => {
 			__( 'Status successfully set', 'google-listings-and-ads' )
 		);
 
-		onClose();
-	}, [ createNotice, onClose ] );
+		onModalClose();
+	}, [ createNotice, onModalClose ] );
 
 	return (
 		<Fragment>
@@ -32,7 +32,7 @@ const Footer = ( { onClose = noop } ) => {
 				isSecondary
 				// @todo: review data-action label
 				data-action="view-product-feed"
-				onClick={ onClose }
+				onClick={ onModalClose }
 			>
 				{ __( 'Close', 'google-listings-and-ads' ) }
 			</AppButton>
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
index 7263264237..6f23d80339 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
@@ -69,7 +69,7 @@ describe( 'Enhanced Conversion Footer', () => {
 	} );
 
 	test( 'Click on enable button callback', () => {
-		const handleOnClose = jest.fn().mockName( 'On button click' );
+		const handleOnModalClose = jest.fn().mockName( 'On button click' );
 
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: true,
@@ -81,16 +81,16 @@ describe( 'Enhanced Conversion Footer', () => {
 			isResolving: false,
 		} );
 
-		render( <Footer onClose={ handleOnClose } /> );
+		render( <Footer onModalClose={ handleOnModalClose } /> );
 
 		const button = screen.getByRole( 'button', { name: 'Confirm' } );
 		userEvent.click( button );
 
-		expect( handleOnClose ).toHaveBeenCalledTimes( 1 );
+		expect( handleOnModalClose ).toHaveBeenCalledTimes( 1 );
 	} );
 
 	test( 'Click on disable button callback', () => {
-		const handleOnClose = jest.fn().mockName( 'On button click' );
+		const handleOnModalClose = jest.fn().mockName( 'On button click' );
 
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: true,
@@ -102,11 +102,11 @@ describe( 'Enhanced Conversion Footer', () => {
 			isResolving: false,
 		} );
 
-		render( <Footer onClose={ handleOnClose } /> );
+		render( <Footer onModalClose={ handleOnModalClose } /> );
 
 		const button = screen.getByRole( 'button', { name: 'Disable' } );
 		userEvent.click( button );
 
-		expect( handleOnClose ).toHaveBeenCalledTimes( 1 );
+		expect( handleOnModalClose ).toHaveBeenCalledTimes( 1 );
 	} );
 } );
diff --git a/js/src/product-feed/submission-success-guide/google-credits/footer.js b/js/src/product-feed/submission-success-guide/google-credits/footer.js
index e49cad2497..e94244102c 100644
--- a/js/src/product-feed/submission-success-guide/google-credits/footer.js
+++ b/js/src/product-feed/submission-success-guide/google-credits/footer.js
@@ -3,7 +3,7 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Fragment } from '@wordpress/element';
-import noop from 'lodash/noop';
+import { noop } from 'lodash';
 
 /**
  * Internal dependencies
@@ -13,7 +13,7 @@ import { GLA_MODAL_CLOSED_EVENT_NAME } from '../constants';
 import AppButton from '.~/components/app-button';
 import AddPaidCampaignButton from '.~/components/paid-ads/add-paid-campaign-button';
 
-const Footer = ( { onClose = noop } ) => {
+const Footer = ( { onModalClose = noop } ) => {
 	return (
 		<Fragment>
 			<div className="gla-submission-success-guide__space_holder" />
@@ -21,7 +21,7 @@ const Footer = ( { onClose = noop } ) => {
 			<AppButton
 				isSecondary
 				data-action="maybe-later"
-				onClick={ onClose }
+				onClick={ onModalClose }
 			>
 				{ __( 'Maybe later', 'google-listings-and-ads' ) }
 			</AppButton>
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index c52ddee98c..ccbfc4db66 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -65,12 +65,12 @@ const pages = [
 	{
 		image,
 		content: <SetupSuccess />,
-		footer: <SetupSuccessFooter onClose={ handleGuideFinish } />,
+		footer: <SetupSuccessFooter onModalClose={ handleGuideFinish } />,
 	},
 	{
 		image,
 		content: <DynamicScreenContent />,
-		footer: <DynamicScreenFooter onClose={ handleGuideFinish } />,
+		footer: <DynamicScreenFooter onModalClose={ handleGuideFinish } />,
 	},
 ];
 
diff --git a/js/src/product-feed/submission-success-guide/setup-success/footer.js b/js/src/product-feed/submission-success-guide/setup-success/footer.js
index 065635319f..62a64d8128 100644
--- a/js/src/product-feed/submission-success-guide/setup-success/footer.js
+++ b/js/src/product-feed/submission-success-guide/setup-success/footer.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
-import noop from 'lodash/noop';
+import { noop } from 'lodash';
 
 /**
  * Internal dependencies
@@ -10,7 +10,7 @@ import noop from 'lodash/noop';
 import { glaData } from '.~/constants';
 import AppButton from '.~/components/app-button';
 
-const Footer = ( { onClose = noop } ) => {
+const Footer = ( { onModalClose = noop } ) => {
 	if ( glaData.adsConnected ) {
 		return null;
 	}
@@ -19,7 +19,7 @@ const Footer = ( { onClose = noop } ) => {
 		<AppButton
 			isPrimary
 			data-action="view-product-feed"
-			onClick={ onClose }
+			onClick={ onModalClose }
 		>
 			{ __( 'View product feed', 'google-listings-and-ads' ) }
 		</AppButton>

From 8a4d44eccb77d07b8fc62ccc58149fed4ce9d70e Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Wed, 6 Mar 2024 16:39:35 +0400
Subject: [PATCH 59/95] Simplify the useAutoCheckEnhancedConversionTOS hook.

---
 js/src/data/actions.js                        | 18 +++++++++
 js/src/data/resolvers.js                      |  8 +---
 .../useAutoCheckEnhancedConversionTOS.js      | 37 ++-----------------
 3 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/js/src/data/actions.js b/js/src/data/actions.js
index 66e3e44d62..6daa7bf1a7 100644
--- a/js/src/data/actions.js
+++ b/js/src/data/actions.js
@@ -1292,3 +1292,21 @@ export function receiveAllowEnhancedConversions( data ) {
 		data,
 	};
 }
+
+export function* fetchAcceptedCustomerDataTerms() {
+	try {
+		const data = yield apiFetch( {
+			path: `${ API_NAMESPACE }/ads/accepted-customer-data-terms`,
+		} );
+
+		return receiveAcceptedTerms( data );
+	} catch ( error ) {
+		handleApiError(
+			error,
+			__(
+				'Unable to complete request. Please try again later.',
+				'google-listings-and-ads'
+			)
+		);
+	}
+}
diff --git a/js/src/data/resolvers.js b/js/src/data/resolvers.js
index 9f19db363f..dae5577a60 100644
--- a/js/src/data/resolvers.js
+++ b/js/src/data/resolvers.js
@@ -34,6 +34,7 @@ import {
 	receiveGoogleMCContactInformation,
 	fetchTargetAudience,
 	fetchMCSetup,
+	fetchAcceptedCustomerDataTerms,
 	receiveGoogleAccountAccess,
 	receiveReport,
 	receiveMCProductStatistics,
@@ -45,7 +46,6 @@ import {
 	receiveMappingRules,
 	receiveStoreCategories,
 	receiveTour,
-	receiveAcceptedTerms,
 	receiveAllowEnhancedConversions,
 } from './actions';
 
@@ -527,11 +527,7 @@ export function* getTour( tourId ) {
  */
 export function* getAcceptedCustomerDataTerms() {
 	try {
-		const response = yield apiFetch( {
-			path: `${ API_NAMESPACE }/ads/accepted-customer-data-terms`,
-		} );
-
-		yield receiveAcceptedTerms( response );
+		yield fetchAcceptedCustomerDataTerms();
 	} catch ( error ) {
 		handleApiError(
 			error,
diff --git a/js/src/hooks/useAutoCheckEnhancedConversionTOS.js b/js/src/hooks/useAutoCheckEnhancedConversionTOS.js
index 476adb3696..1a576165c9 100644
--- a/js/src/hooks/useAutoCheckEnhancedConversionTOS.js
+++ b/js/src/hooks/useAutoCheckEnhancedConversionTOS.js
@@ -1,23 +1,17 @@
 /**
  * External dependencies
  */
-import { __ } from '@wordpress/i18n';
-import { useCallback, useRef, useState } from '@wordpress/element';
-import apiFetch from '@wordpress/api-fetch';
+import { useCallback, useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import { useAppDispatch } from '.~/data';
-import { API_NAMESPACE } from '.~/data/constants';
-import useDispatchCoreNotices from '.~/hooks/useDispatchCoreNotices';
 import useWindowFocusCallbackIntervalEffect from '.~/hooks/useWindowFocusCallbackIntervalEffect';
 
 const useAutoCheckEnhancedConversionTOS = () => {
 	const [ polling, setPolling ] = useState( false );
-	const { createNotice } = useDispatchCoreNotices();
-	const { receiveAcceptedTerms } = useAppDispatch();
-	const prevStatusRef = useRef();
+	const { fetchAcceptedCustomerDataTerms } = useAppDispatch();
 
 	const startEnhancedConversionTOSPolling = useCallback( () => {
 		setPolling( true );
@@ -32,31 +26,8 @@ const useAutoCheckEnhancedConversionTOS = () => {
 			return;
 		}
 
-		const prevStatus = prevStatusRef.current;
-		const tosStatus = await apiFetch( {
-			path: `${ API_NAMESPACE }/ads/accepted-customer-data-terms`,
-		} );
-
-		prevStatusRef.current = tosStatus.status;
-
-		// Prevent the completion API and callback from being called unwanted times due to
-		// the regain focus or interval timer after the status is approved.
-		if ( prevStatus === tosStatus.status || tosStatus.status !== true ) {
-			return;
-		}
-
-		try {
-			receiveAcceptedTerms( tosStatus );
-		} catch ( e ) {
-			createNotice(
-				'error',
-				__(
-					'Unable to complete request. Please try again later.',
-					'google-listings-and-ads'
-				)
-			);
-		}
-	}, [ receiveAcceptedTerms, createNotice, polling ] );
+		fetchAcceptedCustomerDataTerms();
+	}, [ fetchAcceptedCustomerDataTerms, polling ] );
 
 	useWindowFocusCallbackIntervalEffect( checkStatus, 30 );
 

From 42a772e7f4ac16b4dbe587a097541314fd78a5fe Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Wed, 6 Mar 2024 16:47:39 +0400
Subject: [PATCH 60/95] Remove check to display settings.

---
 .../enhanced-conversion-tracking-settings/index.js          | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/index.js b/js/src/components/enhanced-conversion-tracking-settings/index.js
index b46d20c77c..701976bdb4 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/index.js
@@ -6,7 +6,7 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { ENHANCED_ADS_CONVERSION_STATUS, glaData } from '.~/constants';
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import Section from '.~/wcdl/section';
@@ -31,10 +31,6 @@ const EnhancedConversionTrackingSettings = () => {
 	const { acceptedCustomerDataTerms } = useAcceptedCustomerDataTerms();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 
-	if ( ! glaData.adsConnected ) {
-		return null;
-	}
-
 	return (
 		<Section title={ TITLE } description={ DESCRIPTION }>
 			<Section.Card>

From 1c57792a5550860175fb89d1b87b6ce5b21c56e5 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Thu, 7 Mar 2024 14:42:30 +0530
Subject: [PATCH 61/95] Fix: key name for hashed data

---
 src/Google/GlobalSiteTag.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Google/GlobalSiteTag.php b/src/Google/GlobalSiteTag.php
index cc38903d7f..0e661f00c0 100644
--- a/src/Google/GlobalSiteTag.php
+++ b/src/Google/GlobalSiteTag.php
@@ -373,23 +373,23 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 
 			// Add email in EC data.
 			if ( ! empty( $email ) ) {
-				$ec_data['email'] = $this->normalize_and_hash( $email );
+				$ec_data['sha256_email_address'] = $this->normalize_and_hash( $email );
 			}
 
 			// Format phone number in IE64.
 			$phone        = preg_replace( '/[^0-9]/', '', $phone );
 			$phone_length = strlen( $phone );
 			if ( $phone_length > 9 && $phone_length < 14 ) {
-				$phone                   = sprintf( '%s%d', '+', $phone );
-				$ec_data['phone_number'] = $this->normalize_and_hash( $phone );
+				$phone                          = sprintf( '%s%d', '+', $phone );
+				$ec_data['sha256_phone_number'] = $this->normalize_and_hash( $phone );
 			}
 
 			// Check for required address fields.
 			if ( ! empty( $fname ) && ! empty( $lname ) && ! empty( $postcode ) && ! empty( $country ) ) {
-				$ec_data['address']['first_name']  = $this->normalize_and_hash( $fname );
-				$ec_data['address']['last_name']   = $this->normalize_and_hash( $lname );
-				$ec_data['address']['postal_code'] = $this->normalize_and_hash( $postcode );
-				$ec_data['address']['country']     = $this->normalize_and_hash( $country );
+				$ec_data['address']['sha256_first_name']  = $this->normalize_and_hash( $fname );
+				$ec_data['address']['sha256_last_name']   = $this->normalize_and_hash( $lname );
+				$ec_data['address']['sha256_postal_code'] = $this->normalize_and_hash( $postcode );
+				$ec_data['address']['sha256_country']     = $this->normalize_and_hash( $country );
 
 				/**
 				 * Add additional data, if present.
@@ -397,17 +397,17 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 
 				// Add street address.
 				if ( ! empty( $billing_address ) ) {
-					$ec_data['address']['street'] = $this->normalize_and_hash( $billing_address );
+					$ec_data['address']['sha256_street'] = $this->normalize_and_hash( $billing_address );
 				}
 
 				// Add city.
 				if ( ! empty( $city ) ) {
-					$ec_data['address']['city'] = $this->normalize_and_hash( $city );
+					$ec_data['address']['sha256_city'] = $this->normalize_and_hash( $city );
 				}
 
 				// Add region.
 				if ( ! empty( $region ) ) {
-					$ec_data['address']['region'] = $this->normalize_and_hash( $region );
+					$ec_data['address']['sha256_region'] = $this->normalize_and_hash( $region );
 				}
 			}
 
@@ -613,7 +613,7 @@ private function is_enhanced_conversion_enabled(): bool {
 	}
 
 	/**
-	 * Return the hashed data to be sent to Google ads for enhanced conversion.
+	 * Return the hashed data to be sent to Google Ads for enhanced conversion.
 	 *
 	 * @param string $value Data that needs to be hashed.
 	 * @param string $algo  Algorithm for hashing.

From e369351abaa88fab963c8f916f54059caa9a5e6f Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 12 Mar 2024 18:04:06 +0400
Subject: [PATCH 62/95] CR feedback implementation.

---
 .../cta/index.js                              | 25 ++++++++-----------
 .../cta/index.test.js                         | 22 ----------------
 js/src/data/actions.js                        |  5 +---
 .../wordpress/guide/index.js                  | 10 +++-----
 js/src/hooks/useAdsCampaigns.js               |  1 +
 .../dynamic-screen-content.js                 |  4 +--
 .../submission-success-guide/index.js         | 10 +++-----
 7 files changed, 19 insertions(+), 58 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
index 3563ff479d..b62c182471 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
@@ -1,6 +1,7 @@
 /**
  * External dependencies
  */
+import { noop } from 'lodash';
 import { __ } from '@wordpress/i18n';
 import { useCallback, useEffect } from '@wordpress/element';
 import { Spinner } from '@woocommerce/components';
@@ -25,8 +26,8 @@ const CTA = ( {
 	),
 	disableLabel = __( 'Disable', 'google-listings-and-ads' ),
 	enableLabel = __( 'Enable', 'google-listings-and-ads' ),
-	onEnableClick,
-	onDisableClick,
+	onEnableClick = noop,
+	onDisableClick = noop,
 } ) => {
 	const {
 		startEnhancedConversionTOSPolling,
@@ -80,7 +81,7 @@ const CTA = ( {
 			ENHANCED_ADS_CONVERSION_STATUS.DISABLED
 		);
 
-		onDisableClick?.();
+		onDisableClick();
 	}, [
 		updateEnhancedAdsConversionStatus,
 		acceptedCustomerDataTerms,
@@ -96,26 +97,20 @@ const CTA = ( {
 			ENHANCED_ADS_CONVERSION_STATUS.ENABLED
 		);
 
-		onEnableClick?.();
+		onEnableClick();
 	}, [
 		updateEnhancedAdsConversionStatus,
 		acceptedCustomerDataTerms,
 		onEnableClick,
 	] );
 
-	if ( ! hasFinishedResolution ) {
-		return <Spinner />;
-	}
-
 	if (
-		! acceptedCustomerDataTerms &&
-		allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
+		! hasFinishedResolution ||
+		( ! acceptedCustomerDataTerms &&
+			allowEnhancedConversions ===
+				ENHANCED_ADS_CONVERSION_STATUS.PENDING )
 	) {
-		return (
-			<>
-				<AppButton isSecondary disabled loading></AppButton>
-			</>
-		);
+		return <AppButton isSecondary disabled loading></AppButton>;
 	}
 
 	if ( ! acceptedCustomerDataTerms ) {
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
index e17b2a0373..06b776b53c 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
@@ -61,13 +61,11 @@ describe( 'Enhanced Conversion CTA', () => {
 	test( 'When not yet loaded, should render a loading spinner', () => {
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: false,
-			isResolving: false,
 			hasFinishedResolution: false,
 		} );
 
 		useAllowEnhancedConversions.mockReturnValue( {
 			allowEnhancedConversions: null,
-			isResolving: false,
 		} );
 
 		render( <CTA /> );
@@ -78,13 +76,11 @@ describe( 'Enhanced Conversion CTA', () => {
 	test( 'Prompt the user to sign the TOS', () => {
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: false,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 
 		useAllowEnhancedConversions.mockReturnValue( {
 			allowEnhancedConversions: null,
-			isResolving: false,
 		} );
 
 		render(
@@ -98,13 +94,11 @@ describe( 'Enhanced Conversion CTA', () => {
 	test( 'Prompt the user to enable enhanced conversion tracking if the TOS has been accepted', () => {
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: true,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 
 		useAllowEnhancedConversions.mockReturnValue( {
 			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.DISABLED,
-			isResolving: false,
 		} );
 
 		render( <CTA enableLabel="Confirm" /> );
@@ -114,13 +108,11 @@ describe( 'Enhanced Conversion CTA', () => {
 	test( 'Prompt the user to disable enhanced conversion tracking if enabled', () => {
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: true,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 
 		useAllowEnhancedConversions.mockReturnValue( {
 			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.ENABLED,
-			isResolving: false,
 		} );
 
 		render( <CTA disableLabel="Disable tracking" /> );
@@ -130,13 +122,11 @@ describe( 'Enhanced Conversion CTA', () => {
 	test( 'Render a spinner when the status is set to pending', () => {
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: false,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 
 		useAllowEnhancedConversions.mockReturnValue( {
 			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.PENDING,
-			isResolving: false,
 		} );
 
 		render( <CTA /> );
@@ -149,13 +139,11 @@ describe( 'Enhanced Conversion CTA', () => {
 
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: false,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 
 		useAllowEnhancedConversions.mockReturnValue( {
 			allowEnhancedConversions: null,
-			isResolving: false,
 		} );
 
 		render( <CTA /> );
@@ -171,13 +159,11 @@ describe( 'Enhanced Conversion CTA', () => {
 
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: true,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 
 		useAllowEnhancedConversions.mockReturnValue( {
 			allowEnhancedConversions: null,
-			isResolving: false,
 		} );
 
 		render( <CTA onEnableClick={ handleOnEnable } /> );
@@ -193,13 +179,11 @@ describe( 'Enhanced Conversion CTA', () => {
 
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: false,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 
 		useAllowEnhancedConversions.mockReturnValue( {
 			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.ENABLED,
-			isResolving: false,
 		} );
 
 		render( <CTA onEnableClick={ handleOnEnable } /> );
@@ -215,13 +199,11 @@ describe( 'Enhanced Conversion CTA', () => {
 
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: true,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 
 		useAllowEnhancedConversions.mockReturnValue( {
 			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.ENABLED,
-			isResolving: false,
 		} );
 
 		render( <CTA onDisableClick={ handleOnDisable } /> );
@@ -237,13 +219,11 @@ describe( 'Enhanced Conversion CTA', () => {
 
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: false,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 
 		useAllowEnhancedConversions.mockReturnValue( {
 			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.ENABLED,
-			isResolving: false,
 		} );
 
 		render( <CTA onDisableClick={ handleOnDisable } /> );
@@ -257,13 +237,11 @@ describe( 'Enhanced Conversion CTA', () => {
 	test( 'Should render the enable button if TOS has been accepted and the status is not enabled', () => {
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: true,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 
 		useAllowEnhancedConversions.mockReturnValue( {
 			allowEnhancedConversions: null,
-			isResolving: false,
 		} );
 
 		render( <CTA /> );
diff --git a/js/src/data/actions.js b/js/src/data/actions.js
index 6daa7bf1a7..3c23d168e7 100644
--- a/js/src/data/actions.js
+++ b/js/src/data/actions.js
@@ -1271,10 +1271,7 @@ export function* updateEnhancedAdsConversionStatus( status ) {
 			},
 		} );
 
-		return {
-			type: TYPES.RECEIVE_ALLOW_ENHANCED_CONVERSIONS,
-			data: response,
-		};
+		return receiveAllowEnhancedConversions( response );
 	} catch ( error ) {
 		handleApiError(
 			error,
diff --git a/js/src/external-components/wordpress/guide/index.js b/js/src/external-components/wordpress/guide/index.js
index e098a487b1..c293ef01e8 100644
--- a/js/src/external-components/wordpress/guide/index.js
+++ b/js/src/external-components/wordpress/guide/index.js
@@ -37,7 +37,6 @@ import './index.scss';
  *                                    It is required for accessibility reasons.
  * @param {string} [props.backButtonText] Use this to customize the label of the *Previous* button shown at the end of the guide.
  * @param {string} [props.finishButtonText] Use this to customize the label of the *Finish* button shown at the end of the guide.
- * @param {renderFinishCallback} [props.renderFinish] A function for rendering custom finish block shown at the end of the guide.
  * @param {Function} props.onFinish A function which is called when the guide is finished.
  *                                  The guide is finished when the modal is closed
  *                                  or when the user clicks *Finish* on the last page of the guide.
@@ -49,7 +48,6 @@ export default function Guide( {
 	contentLabel,
 	backButtonText,
 	finishButtonText,
-	renderFinish = ( finishButton ) => finishButton,
 	onFinish,
 	pages,
 } ) {
@@ -76,8 +74,8 @@ export default function Guide( {
 
 	let finishBlock = null;
 
-	if ( ! canGoForward ) {
-		const finishButton = (
+	if ( ! canGoForward && ! pages[ currentPage ].actions ) {
+		finishBlock = (
 			<FinishButton
 				className="components-guide__finish-button"
 				onClick={ onFinish }
@@ -85,8 +83,6 @@ export default function Guide( {
 				{ finishButtonText || __( 'Finish' ) }
 			</FinishButton>
 		);
-
-		finishBlock = renderFinish( finishButton );
 	}
 
 	const guideClassName = classnames(
@@ -147,7 +143,7 @@ export default function Guide( {
 
 					{ finishBlock }
 
-					{ pages[ currentPage ].footer }
+					{ pages[ currentPage ].actions }
 				</div>
 			</div>
 		</Modal>
diff --git a/js/src/hooks/useAdsCampaigns.js b/js/src/hooks/useAdsCampaigns.js
index dcdf843fd4..17c1e8f28f 100644
--- a/js/src/hooks/useAdsCampaigns.js
+++ b/js/src/hooks/useAdsCampaigns.js
@@ -19,6 +19,7 @@ const selectorName = 'getAdsCampaigns';
  * @property {Array<Campaign>|null} data Current campaigns obtained from merchant's Google Ads account if connected. It will be `null` before load finished.
  * @property {boolean} loading Whether the `data` is loading. It's equal to `isResolving` state of wp-data selector.
  * @property {boolean} loaded Whether the `data` is finished loading. It's equal to `hasFinishedResolution` state of wp-data selector.
+ * @property {Array<Campaign>|null} pmaxCampaigns PMAX campaigns filtered from the data.
  */
 
 /**
diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-content.js b/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
index b1d525276c..d74796d7d3 100644
--- a/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
@@ -21,9 +21,7 @@ const DynamicScreenContent = () => {
 			<GuidePageContent
 				title={ __( 'Please wait', 'google-listings-and-ads' ) }
 			>
-				<div className="screen-content--loading">
-					<LoadingLabel />
-				</div>
+				<LoadingLabel />
 			</GuidePageContent>
 		);
 	}
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index ccbfc4db66..6e9ab7e53d 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useEffect, useCallback } from '@wordpress/element';
+import { useEffect } from '@wordpress/element';
 import { getHistory } from '@woocommerce/navigation';
 
 /**
@@ -65,12 +65,12 @@ const pages = [
 	{
 		image,
 		content: <SetupSuccess />,
-		footer: <SetupSuccessFooter onModalClose={ handleGuideFinish } />,
+		actions: <SetupSuccessFooter onModalClose={ handleGuideFinish } />,
 	},
 	{
 		image,
 		content: <DynamicScreenContent />,
-		footer: <DynamicScreenFooter onModalClose={ handleGuideFinish } />,
+		actions: <DynamicScreenFooter onModalClose={ handleGuideFinish } />,
 	},
 ];
 
@@ -101,15 +101,11 @@ const SubmissionSuccessGuide = () => {
 		);
 	}, [] );
 
-	// @todo: Review whether we need that function since we have moved the buttons to be per page now.
-	const renderFinish = useCallback( () => null, [] );
-
 	return (
 		<Guide
 			className="gla-submission-success-guide"
 			backButtonText={ __( 'Back', 'google-listings-and-ads' ) }
 			pages={ pages }
-			renderFinish={ renderFinish }
 			onFinish={ handleGuideFinish }
 		/>
 	);

From e12a768fcfca6bf1135d8e05f9f737f309dcc598 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 12 Mar 2024 18:10:29 +0400
Subject: [PATCH 63/95] Remove unused properties from mocks.

---
 .../enhanced-conversion/footer.test.js                      | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
index 6f23d80339..4fc7665fb9 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
@@ -53,12 +53,10 @@ describe( 'Enhanced Conversion Footer', () => {
 	test( 'Prompt the user to accept the TOS', () => {
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: false,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 		useAllowEnhancedConversions.mockReturnValue( {
 			allowEnhancedConversions: null,
-			isResolving: false,
 		} );
 
 		render( <Footer /> );
@@ -73,12 +71,10 @@ describe( 'Enhanced Conversion Footer', () => {
 
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: true,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 		useAllowEnhancedConversions.mockReturnValue( {
 			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.DISABLED,
-			isResolving: false,
 		} );
 
 		render( <Footer onModalClose={ handleOnModalClose } /> );
@@ -94,12 +90,10 @@ describe( 'Enhanced Conversion Footer', () => {
 
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: true,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 		useAllowEnhancedConversions.mockReturnValue( {
 			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.ENABLED,
-			isResolving: false,
 		} );
 
 		render( <Footer onModalClose={ handleOnModalClose } /> );

From 094b7fb7c8b65b362e330619d17716823a1d634e Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 12 Mar 2024 18:19:10 +0400
Subject: [PATCH 64/95] Fix linting errors.

---
 .../enhanced-conversion-tracking-settings/cta/index.js           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
index b62c182471..3b311ba528 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
@@ -4,7 +4,6 @@
 import { noop } from 'lodash';
 import { __ } from '@wordpress/i18n';
 import { useCallback, useEffect } from '@wordpress/element';
-import { Spinner } from '@woocommerce/components';
 
 /**
  * Internal dependencies

From dd21b225d39b1c832e34970e1558c7c4fdbc6227 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 12 Mar 2024 20:28:49 +0400
Subject: [PATCH 65/95] Use Toggle instead of Button for Enhanced Conversion
 Settings panel.

---
 .../{cta/index.js => cta.js}                  | 64 ++++++-------------
 .../{cta/index.test.js => cta.test.js}        |  0
 .../index.js                                  | 14 ++--
 .../pending-notice.js                         | 29 ++++++++-
 .../toggle.js                                 | 57 +++++++++++++++++
 .../useOpenTermsURL.js                        | 16 +++++
 .../useTermsPolling.js                        | 50 +++++++++++++++
 7 files changed, 177 insertions(+), 53 deletions(-)
 rename js/src/components/enhanced-conversion-tracking-settings/{cta/index.js => cta.js} (62%)
 rename js/src/components/enhanced-conversion-tracking-settings/{cta/index.test.js => cta.test.js} (100%)
 create mode 100644 js/src/components/enhanced-conversion-tracking-settings/toggle.js
 create mode 100644 js/src/components/enhanced-conversion-tracking-settings/useOpenTermsURL.js
 create mode 100644 js/src/components/enhanced-conversion-tracking-settings/useTermsPolling.js

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js b/js/src/components/enhanced-conversion-tracking-settings/cta.js
similarity index 62%
rename from js/src/components/enhanced-conversion-tracking-settings/cta/index.js
rename to js/src/components/enhanced-conversion-tracking-settings/cta.js
index 3b311ba528..cd437415a4 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta.js
@@ -3,20 +3,18 @@
  */
 import { noop } from 'lodash';
 import { __ } from '@wordpress/i18n';
-import { useCallback, useEffect } from '@wordpress/element';
+import { useCallback } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import {
-	ENHANCED_ADS_CONVERSION_STATUS,
-	ENHANCED_ADS_TOS_BASE_URL,
-} from '.~/constants';
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import { useAppDispatch } from '.~/data';
 import AppButton from '.~/components/app-button';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
-import useAutoCheckEnhancedConversionTOS from '.~/hooks/useAutoCheckEnhancedConversionTOS';
+import useTermsPolling from './useTermsPolling';
+import useOpenTermsURL from './useOpenTermsURL';
 
 const CTA = ( {
 	acceptTermsLabel = __(
@@ -28,48 +26,24 @@ const CTA = ( {
 	onEnableClick = noop,
 	onDisableClick = noop,
 } ) => {
-	const {
-		startEnhancedConversionTOSPolling,
-		stopEnhancedConversionTOSPolling,
-	} = useAutoCheckEnhancedConversionTOS();
-	const { updateEnhancedAdsConversionStatus, invalidateResolution } =
-		useAppDispatch();
+	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
 	const { acceptedCustomerDataTerms, hasFinishedResolution } =
 		useAcceptedCustomerDataTerms();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
-
-	useEffect( () => {
-		if (
-			! acceptedCustomerDataTerms &&
-			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
-		) {
-			startEnhancedConversionTOSPolling();
-			return;
-		}
-
-		stopEnhancedConversionTOSPolling();
-	}, [
-		acceptedCustomerDataTerms,
-		allowEnhancedConversions,
-		startEnhancedConversionTOSPolling,
-		stopEnhancedConversionTOSPolling,
-	] );
-
-	useEffect( () => {
-		if (
-			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
-		) {
-			invalidateResolution( 'getAcceptedCustomerDataTerms', [] );
-		}
-	}, [ allowEnhancedConversions, invalidateResolution ] );
-
-	const handleTOS = useCallback( () => {
-		window.open( ENHANCED_ADS_TOS_BASE_URL, '_blank' );
-
-		updateEnhancedAdsConversionStatus(
-			ENHANCED_ADS_CONVERSION_STATUS.PENDING
-		);
-	}, [ updateEnhancedAdsConversionStatus ] );
+	const { openTermsURL } = useOpenTermsURL();
+	useTermsPolling();
+
+	const handleTOS = useCallback(
+		( event ) => {
+			event.preventDefault();
+
+			openTermsURL();
+			updateEnhancedAdsConversionStatus(
+				ENHANCED_ADS_CONVERSION_STATUS.PENDING
+			);
+		},
+		[ updateEnhancedAdsConversionStatus, openTermsURL ]
+	);
 
 	const handleDisable = useCallback( () => {
 		if ( ! acceptedCustomerDataTerms ) {
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js b/js/src/components/enhanced-conversion-tracking-settings/cta.test.js
similarity index 100%
rename from js/src/components/enhanced-conversion-tracking-settings/cta/index.test.js
rename to js/src/components/enhanced-conversion-tracking-settings/cta.test.js
diff --git a/js/src/components/enhanced-conversion-tracking-settings/index.js b/js/src/components/enhanced-conversion-tracking-settings/index.js
index 701976bdb4..2d47f256c0 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/index.js
@@ -9,9 +9,10 @@ import { __ } from '@wordpress/i18n';
 import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
 import Section from '.~/wcdl/section';
 import PendingNotice from '.~/components/enhanced-conversion-tracking-settings/pending-notice';
-import CTA from './cta';
+import Toggle from './toggle';
 
 const DESCRIPTION = (
 	<p>
@@ -28,18 +29,21 @@ const TITLE = __( 'Enhanced Conversion Tracking', 'google-listings-and-ads' );
  * Renders the settings panel for enhanced conversion tracking
  */
 const EnhancedConversionTrackingSettings = () => {
+	const { googleAdsAccount } = useGoogleAdsAccount();
 	const { acceptedCustomerDataTerms } = useAcceptedCustomerDataTerms();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 
+	if ( ! googleAdsAccount || ! googleAdsAccount.id ) {
+		return null;
+	}
+
 	return (
 		<Section title={ TITLE } description={ DESCRIPTION }>
 			<Section.Card>
 				<Section.Card.Body>
-					{ allowEnhancedConversions ===
-						ENHANCED_ADS_CONVERSION_STATUS.PENDING &&
-						! acceptedCustomerDataTerms && <PendingNotice /> }
+					{ ! acceptedCustomerDataTerms && <PendingNotice /> }
 
-					<CTA />
+					<Toggle />
 				</Section.Card.Body>
 			</Section.Card>
 		</Section>
diff --git a/js/src/components/enhanced-conversion-tracking-settings/pending-notice.js b/js/src/components/enhanced-conversion-tracking-settings/pending-notice.js
index 731b684852..8728076e59 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/pending-notice.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/pending-notice.js
@@ -2,15 +2,37 @@
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { createInterpolateElement } from '@wordpress/element';
+import { createInterpolateElement, useCallback } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
-import { ENHANCED_ADS_TOS_BASE_URL } from '.~/constants';
+import {
+	ENHANCED_ADS_TOS_BASE_URL,
+	ENHANCED_ADS_CONVERSION_STATUS,
+} from '.~/constants';
+import { useAppDispatch } from '.~/data';
 import TrackableLink from '.~/components/trackable-link';
+import useTermsPolling from './useTermsPolling';
+import useOpenTermsURL from './useOpenTermsURL';
 
 const PendingNotice = () => {
+	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
+	const { openTermsURL } = useOpenTermsURL();
+	useTermsPolling();
+
+	const handleOnClick = useCallback(
+		( event ) => {
+			event.preventDefault();
+
+			openTermsURL();
+			updateEnhancedAdsConversionStatus(
+				ENHANCED_ADS_CONVERSION_STATUS.PENDING
+			);
+		},
+		[ updateEnhancedAdsConversionStatus, openTermsURL ]
+	);
+
 	return (
 		<p>
 			{ createInterpolateElement(
@@ -21,10 +43,11 @@ const PendingNotice = () => {
 				{
 					link: (
 						<TrackableLink
-							href={ ENHANCED_ADS_TOS_BASE_URL }
+							href={ ENHANCED_ADS_TOS_BASE_URL } // @todo: should deep link
 							target="_blank"
 							type="external"
 							eventName="gla_ads_tos" // @todo: review eventName
+							onClick={ handleOnClick }
 						/>
 					),
 				}
diff --git a/js/src/components/enhanced-conversion-tracking-settings/toggle.js b/js/src/components/enhanced-conversion-tracking-settings/toggle.js
new file mode 100644
index 0000000000..75f5050237
--- /dev/null
+++ b/js/src/components/enhanced-conversion-tracking-settings/toggle.js
@@ -0,0 +1,57 @@
+/**
+ * External dependencies
+ */
+import { useCallback, useEffect } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
+import { useAppDispatch } from '.~/data';
+import AppStandaloneToggleControl from '.~/components/app-standalone-toggle-control';
+import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
+import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+
+const Toggle = () => {
+	const { updateEnhancedAdsConversionStatus, invalidateResolution } =
+		useAppDispatch();
+	const { allowEnhancedConversions } = useAllowEnhancedConversions();
+	const { acceptedCustomerDataTerms, hasFinishedResolution } =
+		useAcceptedCustomerDataTerms();
+
+	useEffect( () => {
+		if (
+			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
+		) {
+			invalidateResolution( 'getAcceptedCustomerDataTerms', [] );
+		}
+	}, [ allowEnhancedConversions, invalidateResolution ] );
+
+	const handleOnChange = useCallback(
+		( value ) => {
+			if ( ! acceptedCustomerDataTerms ) {
+				return;
+			}
+
+			updateEnhancedAdsConversionStatus(
+				value
+					? ENHANCED_ADS_CONVERSION_STATUS.ENABLED
+					: ENHANCED_ADS_CONVERSION_STATUS.DISABLED
+			);
+		},
+		[ updateEnhancedAdsConversionStatus, acceptedCustomerDataTerms ]
+	);
+
+	return (
+		<AppStandaloneToggleControl
+			checked={
+				allowEnhancedConversions ===
+				ENHANCED_ADS_CONVERSION_STATUS.ENABLED
+			}
+			disabled={ ! hasFinishedResolution || ! acceptedCustomerDataTerms }
+			onChange={ handleOnChange }
+		/>
+	);
+};
+
+export default Toggle;
diff --git a/js/src/components/enhanced-conversion-tracking-settings/useOpenTermsURL.js b/js/src/components/enhanced-conversion-tracking-settings/useOpenTermsURL.js
new file mode 100644
index 0000000000..82b461eba0
--- /dev/null
+++ b/js/src/components/enhanced-conversion-tracking-settings/useOpenTermsURL.js
@@ -0,0 +1,16 @@
+/**
+ * Internal dependencies
+ */
+import { ENHANCED_ADS_TOS_BASE_URL } from '.~/constants';
+
+const useOpenTermsURL = () => {
+	// Extracted as hook for later we want to get the deep link
+	// @todo: Deeplink
+	const openTermsURL = () => {
+		window.open( ENHANCED_ADS_TOS_BASE_URL, '_blank' );
+	};
+
+	return { openTermsURL };
+};
+
+export default useOpenTermsURL;
diff --git a/js/src/components/enhanced-conversion-tracking-settings/useTermsPolling.js b/js/src/components/enhanced-conversion-tracking-settings/useTermsPolling.js
new file mode 100644
index 0000000000..1f9e0fc5e8
--- /dev/null
+++ b/js/src/components/enhanced-conversion-tracking-settings/useTermsPolling.js
@@ -0,0 +1,50 @@
+/**
+ * External dependencies
+ */
+import { useEffect } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
+import { useAppDispatch } from '.~/data';
+import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
+import useAutoCheckEnhancedConversionTOS from '.~/hooks/useAutoCheckEnhancedConversionTOS';
+
+const useTermsPolling = () => {
+	const { invalidateResolution } = useAppDispatch();
+	const {
+		startEnhancedConversionTOSPolling,
+		stopEnhancedConversionTOSPolling,
+	} = useAutoCheckEnhancedConversionTOS();
+	const { allowEnhancedConversions } = useAllowEnhancedConversions();
+	const { acceptedCustomerDataTerms } = useAcceptedCustomerDataTerms();
+
+	useEffect( () => {
+		if (
+			! acceptedCustomerDataTerms &&
+			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
+		) {
+			startEnhancedConversionTOSPolling();
+			return;
+		}
+
+		stopEnhancedConversionTOSPolling();
+	}, [
+		acceptedCustomerDataTerms,
+		allowEnhancedConversions,
+		startEnhancedConversionTOSPolling,
+		stopEnhancedConversionTOSPolling,
+	] );
+
+	useEffect( () => {
+		if (
+			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
+		) {
+			invalidateResolution( 'getAcceptedCustomerDataTerms', [] );
+		}
+	}, [ allowEnhancedConversions, invalidateResolution ] );
+};
+
+export default useTermsPolling;

From d94a2d269728b883864971ed66f746ef2d6af5df Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Tue, 12 Mar 2024 20:44:21 +0400
Subject: [PATCH 66/95] Show Spinner while resolving Enhanced Conversion
 status.

---
 .../cta.test.js                               |  2 +-
 .../index.js                                  |  3 ---
 .../toggle.js                                 | 24 ++++++++++++++++++-
 js/src/hooks/useAllowEnhancedConversions.js   |  5 +++-
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta.test.js b/js/src/components/enhanced-conversion-tracking-settings/cta.test.js
index 06b776b53c..5ddf40c03b 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta.test.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta.test.js
@@ -51,7 +51,7 @@ import '@testing-library/jest-dom';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
-import CTA from './index';
+import CTA from './cta';
 
 describe( 'Enhanced Conversion CTA', () => {
 	beforeEach( () => {
diff --git a/js/src/components/enhanced-conversion-tracking-settings/index.js b/js/src/components/enhanced-conversion-tracking-settings/index.js
index 2d47f256c0..4f4cfd4fcf 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/index.js
@@ -6,8 +6,6 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
-import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
 import Section from '.~/wcdl/section';
@@ -31,7 +29,6 @@ const TITLE = __( 'Enhanced Conversion Tracking', 'google-listings-and-ads' );
 const EnhancedConversionTrackingSettings = () => {
 	const { googleAdsAccount } = useGoogleAdsAccount();
 	const { acceptedCustomerDataTerms } = useAcceptedCustomerDataTerms();
-	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 
 	if ( ! googleAdsAccount || ! googleAdsAccount.id ) {
 		return null;
diff --git a/js/src/components/enhanced-conversion-tracking-settings/toggle.js b/js/src/components/enhanced-conversion-tracking-settings/toggle.js
index 75f5050237..0c9af43467 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/toggle.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/toggle.js
@@ -1,7 +1,9 @@
 /**
  * External dependencies
  */
+import { __ } from '@wordpress/i18n';
 import { useCallback, useEffect } from '@wordpress/element';
+import { Spinner } from '@woocommerce/components';
 
 /**
  * Internal dependencies
@@ -12,10 +14,22 @@ import AppStandaloneToggleControl from '.~/components/app-standalone-toggle-cont
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 
+const TOGGLE_LABEL_MAP = {
+	[ ENHANCED_ADS_CONVERSION_STATUS.DISABLED ]: __(
+		'Enable',
+		'google-listings-and-ads'
+	),
+	[ ENHANCED_ADS_CONVERSION_STATUS.ENABLED ]: __(
+		'Disable',
+		'google-listings-and-ads'
+	),
+};
+
 const Toggle = () => {
 	const { updateEnhancedAdsConversionStatus, invalidateResolution } =
 		useAppDispatch();
-	const { allowEnhancedConversions } = useAllowEnhancedConversions();
+	const { allowEnhancedConversions, isResolving } =
+		useAllowEnhancedConversions();
 	const { acceptedCustomerDataTerms, hasFinishedResolution } =
 		useAcceptedCustomerDataTerms();
 
@@ -42,6 +56,10 @@ const Toggle = () => {
 		[ updateEnhancedAdsConversionStatus, acceptedCustomerDataTerms ]
 	);
 
+	if ( isResolving ) {
+		return <Spinner />;
+	}
+
 	return (
 		<AppStandaloneToggleControl
 			checked={
@@ -50,6 +68,10 @@ const Toggle = () => {
 			}
 			disabled={ ! hasFinishedResolution || ! acceptedCustomerDataTerms }
 			onChange={ handleOnChange }
+			label={
+				TOGGLE_LABEL_MAP[ allowEnhancedConversions ] ||
+				__( 'Enable', 'google-listings-and-ads' )
+			}
 		/>
 	);
 };
diff --git a/js/src/hooks/useAllowEnhancedConversions.js b/js/src/hooks/useAllowEnhancedConversions.js
index c132b6af3b..2d9982eb8d 100644
--- a/js/src/hooks/useAllowEnhancedConversions.js
+++ b/js/src/hooks/useAllowEnhancedConversions.js
@@ -12,8 +12,11 @@ const useAllowEnhancedConversions = () => {
 	return useSelect( ( select ) => {
 		const allowEnhancedConversions =
 			select( STORE_KEY ).getAllowEnhancedConversions();
+		const isResolving = select( STORE_KEY ).isResolving(
+			'getAllowEnhancedConversions'
+		);
 
-		return { allowEnhancedConversions };
+		return { allowEnhancedConversions, isResolving };
 	}, [] );
 };
 

From ed233e3e9a5cd8d8af0db7e9d523b4deb8ceddd3 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Thu, 14 Mar 2024 16:44:25 +0400
Subject: [PATCH 67/95] Update tests.

---
 .../cta.js                                    |  2 +-
 .../toggle.js                                 | 15 +++++---
 .../wordpress/guide/index.js                  |  6 ---
 js/src/hooks/useAcceptedCustomerDataTerms.js  | 38 +++++++++++++------
 .../useAcceptedCustomerDataTerms.test.js      | 26 ++++++++++++-
 js/src/hooks/useAllowEnhancedConversions.js   | 16 +++++---
 6 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta.js b/js/src/components/enhanced-conversion-tracking-settings/cta.js
index cd437415a4..dfd9eb6d71 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta.js
@@ -83,7 +83,7 @@ const CTA = ( {
 			allowEnhancedConversions ===
 				ENHANCED_ADS_CONVERSION_STATUS.PENDING )
 	) {
-		return <AppButton isSecondary disabled loading></AppButton>;
+		return <AppButton isSecondary disabled loading />;
 	}
 
 	if ( ! acceptedCustomerDataTerms ) {
diff --git a/js/src/components/enhanced-conversion-tracking-settings/toggle.js b/js/src/components/enhanced-conversion-tracking-settings/toggle.js
index 0c9af43467..dd2d6e38a4 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/toggle.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/toggle.js
@@ -28,10 +28,12 @@ const TOGGLE_LABEL_MAP = {
 const Toggle = () => {
 	const { updateEnhancedAdsConversionStatus, invalidateResolution } =
 		useAppDispatch();
-	const { allowEnhancedConversions, isResolving } =
+	const { allowEnhancedConversions, hasFinishedResolution } =
 		useAllowEnhancedConversions();
-	const { acceptedCustomerDataTerms, hasFinishedResolution } =
-		useAcceptedCustomerDataTerms();
+	const {
+		acceptedCustomerDataTerms,
+		hasFinishedResolution: hasResolvedAcceptedCustomerDataTerms,
+	} = useAcceptedCustomerDataTerms();
 
 	useEffect( () => {
 		if (
@@ -56,7 +58,7 @@ const Toggle = () => {
 		[ updateEnhancedAdsConversionStatus, acceptedCustomerDataTerms ]
 	);
 
-	if ( isResolving ) {
+	if ( ! hasFinishedResolution ) {
 		return <Spinner />;
 	}
 
@@ -66,7 +68,10 @@ const Toggle = () => {
 				allowEnhancedConversions ===
 				ENHANCED_ADS_CONVERSION_STATUS.ENABLED
 			}
-			disabled={ ! hasFinishedResolution || ! acceptedCustomerDataTerms }
+			disabled={
+				! hasResolvedAcceptedCustomerDataTerms ||
+				! acceptedCustomerDataTerms
+			}
 			onChange={ handleOnChange }
 			label={
 				TOGGLE_LABEL_MAP[ allowEnhancedConversions ] ||
diff --git a/js/src/external-components/wordpress/guide/index.js b/js/src/external-components/wordpress/guide/index.js
index c293ef01e8..673a313eb9 100644
--- a/js/src/external-components/wordpress/guide/index.js
+++ b/js/src/external-components/wordpress/guide/index.js
@@ -20,12 +20,6 @@ import PageControl from './page-control';
 import FinishButton from './finish-button';
 import './index.scss';
 
-/**
- * @callback renderFinishCallback
- * @param {JSX.Element} finishButton The built-in finish button of this Guide component.
- * @return {JSX.Element} React element for rendering.
- */
-
 /**
  * `Guide` is a React component that renders a user guide in a modal.
  * The guide consists of several pages which the user can step through one by one.
diff --git a/js/src/hooks/useAcceptedCustomerDataTerms.js b/js/src/hooks/useAcceptedCustomerDataTerms.js
index 5f2507106a..07a6909ccb 100644
--- a/js/src/hooks/useAcceptedCustomerDataTerms.js
+++ b/js/src/hooks/useAcceptedCustomerDataTerms.js
@@ -7,20 +7,36 @@ import { useSelect } from '@wordpress/data';
  * Internal dependencies
  */
 import { STORE_KEY } from '.~/data/constants';
+import useGoogleAdsAccount from './useGoogleAdsAccount';
+
+const selectorName = 'getAcceptedCustomerDataTerms';
 
 const useAcceptedCustomerDataTerms = () => {
-	return useSelect( ( select ) => {
-		const acceptedCustomerDataTerms =
-			select( STORE_KEY ).getAcceptedCustomerDataTerms();
-		const hasFinishedResolution = select( STORE_KEY ).hasFinishedResolution(
-			'getAcceptedCustomerDataTerms'
-		);
+	const { hasGoogleAdsConnection, hasFinishedResolution } =
+		useGoogleAdsAccount();
+	console.debug( useGoogleAdsAccount() );
+
+	return useSelect(
+		( select ) => {
+			if ( ! hasGoogleAdsConnection ) {
+				return {
+					acceptedCustomerDataTerms: null,
+					hasFinishedResolution,
+				};
+			}
+
+			const selector = select( STORE_KEY );
 
-		return {
-			acceptedCustomerDataTerms,
-			hasFinishedResolution,
-		};
-	}, [] );
+			return {
+				acceptedCustomerDataTerms: selector[ selectorName ](),
+				hasFinishedResolution: selector.hasFinishedResolution(
+					selectorName,
+					[]
+				),
+			};
+		},
+		[ hasGoogleAdsConnection, hasFinishedResolution ]
+	);
 };
 
 export default useAcceptedCustomerDataTerms;
diff --git a/js/src/hooks/useAcceptedCustomerDataTerms.test.js b/js/src/hooks/useAcceptedCustomerDataTerms.test.js
index dfa5ba83a1..26bc4e889a 100644
--- a/js/src/hooks/useAcceptedCustomerDataTerms.test.js
+++ b/js/src/hooks/useAcceptedCustomerDataTerms.test.js
@@ -8,13 +8,37 @@ import { renderHook } from '@testing-library/react-hooks';
  */
 import { useAppDispatch } from '.~/data';
 import useAcceptedCustomerDataTerms from './useAcceptedCustomerDataTerms';
+import useGoogleAccount from '.~/hooks/useGoogleAccount';
+import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
+
+jest.mock( '.~/hooks/useGoogleAdsAccount', () =>
+	jest.fn().mockName( 'useGoogleAdsAccount' ).mockReturnValue( {} )
+);
+
+jest.mock( '.~/hooks/useGoogleAccount', () =>
+	jest.fn().mockName( 'useGoogleAccount' ).mockReturnValue( {} )
+);
 
 describe( 'useAcceptedCustomerDataTerms', () => {
 	it( 'Returns the correct status when set to true', () => {
+		useGoogleAccount.mockReturnValue( {
+			hasFinishedResolution: true,
+			isResolving: false,
+			scope: {
+				adsRequired: true,
+			},
+			google: true,
+		} );
+
+		useGoogleAdsAccount.mockReturnValue( {
+			hasGoogleAdsConnection: true,
+			hasFinishedResolution: true,
+		} );
+
 		const { result } = renderHook( () => {
 			const { receiveAcceptedTerms } = useAppDispatch();
-			receiveAcceptedTerms( { status: true } );
 
+			receiveAcceptedTerms( { status: true } );
 			return useAcceptedCustomerDataTerms();
 		} );
 
diff --git a/js/src/hooks/useAllowEnhancedConversions.js b/js/src/hooks/useAllowEnhancedConversions.js
index 2d9982eb8d..c200541076 100644
--- a/js/src/hooks/useAllowEnhancedConversions.js
+++ b/js/src/hooks/useAllowEnhancedConversions.js
@@ -8,15 +8,19 @@ import { useSelect } from '@wordpress/data';
  */
 import { STORE_KEY } from '.~/data/constants';
 
+const selectorName = 'getAllowEnhancedConversions';
+
 const useAllowEnhancedConversions = () => {
 	return useSelect( ( select ) => {
-		const allowEnhancedConversions =
-			select( STORE_KEY ).getAllowEnhancedConversions();
-		const isResolving = select( STORE_KEY ).isResolving(
-			'getAllowEnhancedConversions'
-		);
+		const selector = select( STORE_KEY );
 
-		return { allowEnhancedConversions, isResolving };
+		return {
+			allowEnhancedConversions: selector[ selectorName ](),
+			hasFinishedResolution: selector.hasFinishedResolution(
+				selectorName,
+				[]
+			),
+		};
 	}, [] );
 };
 

From 3fb3910f3dc85457cd341f8edf9939fe8ff307bb Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Thu, 14 Mar 2024 16:49:25 +0400
Subject: [PATCH 68/95] Update tests to remove isResolving.

---
 js/src/hooks/useAcceptedCustomerDataTerms.js                    | 1 -
 .../submission-success-guide/enhanced-conversion/index.test.js  | 2 --
 2 files changed, 3 deletions(-)

diff --git a/js/src/hooks/useAcceptedCustomerDataTerms.js b/js/src/hooks/useAcceptedCustomerDataTerms.js
index 07a6909ccb..099ee1cb49 100644
--- a/js/src/hooks/useAcceptedCustomerDataTerms.js
+++ b/js/src/hooks/useAcceptedCustomerDataTerms.js
@@ -14,7 +14,6 @@ const selectorName = 'getAcceptedCustomerDataTerms';
 const useAcceptedCustomerDataTerms = () => {
 	const { hasGoogleAdsConnection, hasFinishedResolution } =
 		useGoogleAdsAccount();
-	console.debug( useGoogleAdsAccount() );
 
 	return useSelect(
 		( select ) => {
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/index.test.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.test.js
index 9f0fcb845e..9f52cad697 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/index.test.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.test.js
@@ -23,7 +23,6 @@ describe( 'Enhanced Conversion', () => {
 	test( 'Render the correct text when TOS has not been accepted', () => {
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: false,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 
@@ -38,7 +37,6 @@ describe( 'Enhanced Conversion', () => {
 	test( 'Render the correct text when TOS has been accepted', () => {
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: true,
-			isResolving: false,
 			hasFinishedResolution: true,
 		} );
 

From 8293c5a3547ea0b943a8ece2f745e8fc40b603e5 Mon Sep 17 00:00:00 2001
From: Asvin Balloo <asvin.balloo@gmail.com>
Date: Thu, 14 Mar 2024 16:56:07 +0400
Subject: [PATCH 69/95] Check for valid Google Ads account and ID.

---
 js/src/hooks/useAcceptedCustomerDataTerms.js      | 7 +++----
 js/src/hooks/useAcceptedCustomerDataTerms.test.js | 9 ++++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/js/src/hooks/useAcceptedCustomerDataTerms.js b/js/src/hooks/useAcceptedCustomerDataTerms.js
index 099ee1cb49..03cda88e56 100644
--- a/js/src/hooks/useAcceptedCustomerDataTerms.js
+++ b/js/src/hooks/useAcceptedCustomerDataTerms.js
@@ -12,12 +12,11 @@ import useGoogleAdsAccount from './useGoogleAdsAccount';
 const selectorName = 'getAcceptedCustomerDataTerms';
 
 const useAcceptedCustomerDataTerms = () => {
-	const { hasGoogleAdsConnection, hasFinishedResolution } =
-		useGoogleAdsAccount();
+	const { googleAdsAccount, hasFinishedResolution } = useGoogleAdsAccount();
 
 	return useSelect(
 		( select ) => {
-			if ( ! hasGoogleAdsConnection ) {
+			if ( ! googleAdsAccount || ! googleAdsAccount.id ) {
 				return {
 					acceptedCustomerDataTerms: null,
 					hasFinishedResolution,
@@ -34,7 +33,7 @@ const useAcceptedCustomerDataTerms = () => {
 				),
 			};
 		},
-		[ hasGoogleAdsConnection, hasFinishedResolution ]
+		[ googleAdsAccount, hasFinishedResolution ]
 	);
 };
 
diff --git a/js/src/hooks/useAcceptedCustomerDataTerms.test.js b/js/src/hooks/useAcceptedCustomerDataTerms.test.js
index 26bc4e889a..d4d2928440 100644
--- a/js/src/hooks/useAcceptedCustomerDataTerms.test.js
+++ b/js/src/hooks/useAcceptedCustomerDataTerms.test.js
@@ -19,6 +19,13 @@ jest.mock( '.~/hooks/useGoogleAccount', () =>
 	jest.fn().mockName( 'useGoogleAccount' ).mockReturnValue( {} )
 );
 
+const CONNECTED_GOOGLE_ADS_ACCOUNT = {
+	id: 777777,
+	currency: 'PLN',
+	symbol: 'zł',
+	status: 'connected',
+};
+
 describe( 'useAcceptedCustomerDataTerms', () => {
 	it( 'Returns the correct status when set to true', () => {
 		useGoogleAccount.mockReturnValue( {
@@ -31,7 +38,7 @@ describe( 'useAcceptedCustomerDataTerms', () => {
 		} );
 
 		useGoogleAdsAccount.mockReturnValue( {
-			hasGoogleAdsConnection: true,
+			googleAdsAccount: CONNECTED_GOOGLE_ADS_ACCOUNT,
 			hasFinishedResolution: true,
 		} );
 

From e93b854436b8868e24485ae512ba736873e9473d Mon Sep 17 00:00:00 2001
From: Joe McGill <joe.mcgill@10up.com>
Date: Fri, 15 Mar 2024 11:41:46 -0500
Subject: [PATCH 70/95] Add EC data prior to firing events

---
 src/Google/GlobalSiteTag.php | 119 ++++++++++++++++++-----------------
 1 file changed, 60 insertions(+), 59 deletions(-)

diff --git a/src/Google/GlobalSiteTag.php b/src/Google/GlobalSiteTag.php
index de4c420dc4..00957412db 100644
--- a/src/Google/GlobalSiteTag.php
+++ b/src/Google/GlobalSiteTag.php
@@ -348,6 +348,66 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 		$order->update_meta_data( self::ORDER_CONVERSION_META_KEY, 1 );
 		$order->save_meta_data();
 
+		// Prepare and enqueue the enhanced conversion data, if enabled.
+		if ( $this->is_enhanced_conversion_enabled() ) {
+			// Enhanced conversion data.
+			$ec_data         = [];
+			$customer        = new WC_Customer( $order->get_customer_id() );
+			$email           = $customer->get_billing_email();
+			$fname           = $customer->get_billing_first_name();
+			$lname           = $customer->get_billing_last_name();
+			$phone           = $customer->get_billing_phone();
+			$billing_address = $customer->get_billing_address();
+			$postcode        = $customer->get_billing_postcode();
+			$city            = $customer->get_billing_city();
+			$region          = $customer->get_billing_state();
+			$country         = $customer->get_billing_country();
+
+			// Add email in EC data.
+			if ( ! empty( $email ) ) {
+				$ec_data['sha256_email_address'] = $this->normalize_and_hash( $email );
+			}
+
+			// Format phone number in IE64.
+			$phone        = preg_replace( '/[^0-9]/', '', $phone );
+			$phone_length = strlen( $phone );
+			if ( $phone_length > 9 && $phone_length < 14 ) {
+				$phone                          = sprintf( '%s%d', '+', $phone );
+				$ec_data['sha256_phone_number'] = $this->normalize_and_hash( $phone );
+			}
+
+			// Check for required address fields.
+			if ( ! empty( $fname ) && ! empty( $lname ) && ! empty( $postcode ) && ! empty( $country ) ) {
+				$ec_data['address']['sha256_first_name']  = $this->normalize_and_hash( $fname );
+				$ec_data['address']['sha256_last_name']   = $this->normalize_and_hash( $lname );
+				$ec_data['address']['sha256_postal_code'] = $this->normalize_and_hash( $postcode );
+				$ec_data['address']['sha256_country']     = $this->normalize_and_hash( $country );
+
+				/**
+				 * Add additional data, if present.
+				 */
+
+				// Add street address.
+				if ( ! empty( $billing_address ) ) {
+					$ec_data['address']['sha256_street'] = $this->normalize_and_hash( $billing_address );
+				}
+
+				// Add city.
+				if ( ! empty( $city ) ) {
+					$ec_data['address']['sha256_city'] = $this->normalize_and_hash( $city );
+				}
+
+				// Add region.
+				if ( ! empty( $region ) ) {
+					$ec_data['address']['sha256_region'] = $this->normalize_and_hash( $region );
+				}
+			}
+
+			$purchase_user_data_gtag = sprintf( 'gtag("set", "user_data", %s)', wp_json_encode( $ec_data ) );
+
+			$this->add_inline_event_script( $purchase_user_data_gtag );
+		}
+
 		$conversion_gtag_info =
 		sprintf(
 			'gtag("event", "conversion", {
@@ -422,65 +482,6 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 			join( ',', $item_info ),
 		);
 
-		if ( $this->is_enhanced_conversion_enabled() ) {
-			// Enhanced conversion data.
-			$ec_data         = [];
-			$customer        = new WC_Customer( $order->get_customer_id() );
-			$email           = $customer->get_billing_email();
-			$fname           = $customer->get_billing_first_name();
-			$lname           = $customer->get_billing_last_name();
-			$phone           = $customer->get_billing_phone();
-			$billing_address = $customer->get_billing_address();
-			$postcode        = $customer->get_billing_postcode();
-			$city            = $customer->get_billing_city();
-			$region          = $customer->get_billing_state();
-			$country         = $customer->get_billing_country();
-
-			// Add email in EC data.
-			if ( ! empty( $email ) ) {
-				$ec_data['sha256_email_address'] = $this->normalize_and_hash( $email );
-			}
-
-			// Format phone number in IE64.
-			$phone        = preg_replace( '/[^0-9]/', '', $phone );
-			$phone_length = strlen( $phone );
-			if ( $phone_length > 9 && $phone_length < 14 ) {
-				$phone                          = sprintf( '%s%d', '+', $phone );
-				$ec_data['sha256_phone_number'] = $this->normalize_and_hash( $phone );
-			}
-
-			// Check for required address fields.
-			if ( ! empty( $fname ) && ! empty( $lname ) && ! empty( $postcode ) && ! empty( $country ) ) {
-				$ec_data['address']['sha256_first_name']  = $this->normalize_and_hash( $fname );
-				$ec_data['address']['sha256_last_name']   = $this->normalize_and_hash( $lname );
-				$ec_data['address']['sha256_postal_code'] = $this->normalize_and_hash( $postcode );
-				$ec_data['address']['sha256_country']     = $this->normalize_and_hash( $country );
-
-				/**
-				 * Add additional data, if present.
-				 */
-
-				// Add street address.
-				if ( ! empty( $billing_address ) ) {
-					$ec_data['address']['sha256_street'] = $this->normalize_and_hash( $billing_address );
-				}
-
-				// Add city.
-				if ( ! empty( $city ) ) {
-					$ec_data['address']['sha256_city'] = $this->normalize_and_hash( $city );
-				}
-
-				// Add region.
-				if ( ! empty( $region ) ) {
-					$ec_data['address']['sha256_region'] = $this->normalize_and_hash( $region );
-				}
-			}
-
-			$purchase_user_data_gtag = sprintf( 'gtag("set", "user_data", %s)', wp_json_encode( $ec_data ) );
-
-			$this->add_inline_event_script( $purchase_user_data_gtag );
-		}
-
 		$this->add_inline_event_script( $purchase_page_gtag );
 	}
 

From c0da595c33d9e7ce10c06a193fb7c4237f8d57ba Mon Sep 17 00:00:00 2001
From: Joe McGill <joe.mcgill@10up.com>
Date: Fri, 15 Mar 2024 13:31:59 -0500
Subject: [PATCH 71/95] Update e2e tests

---
 .../e2e/specs/gtag-events/gtag-events.test.js | 22 ++++++++--
 tests/e2e/test-data/test-data.php             | 40 +++++++++++++++++++
 tests/e2e/utils/api.js                        | 14 +++++++
 3 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/specs/gtag-events/gtag-events.test.js b/tests/e2e/specs/gtag-events/gtag-events.test.js
index 8a46b9bddc..42bcd7dec1 100644
--- a/tests/e2e/specs/gtag-events/gtag-events.test.js
+++ b/tests/e2e/specs/gtag-events/gtag-events.test.js
@@ -10,6 +10,7 @@ import {
 	createSimpleProduct,
 	setConversionID,
 	clearConversionID,
+	enableEnhancedConversions,
 } from '../../utils/api';
 import {
 	blockProductAddToCart,
@@ -193,17 +194,32 @@ test.describe( 'GTag events', () => {
 		} );
 	} );
 
-	test( 'User data for enhanced conversion event is sent on order complete page', async ( {
+	test( 'User data for enhanced conversions are not sent when not enabled', async ( {
 		page,
 	} ) => {
 		await singleProductAddToCart( page, simpleProductID );
 
-		const event = trackGtagEvent( page, 'user_data', 'checkout' );
+		const event = trackGtagEvent( page, 'conversion', 'checkout' );
+		await checkout( page );
+
+		await event.then( ( request ) => {
+			const data = getEventData( request );
+			expect( data.user_data ).toBeUndefined();
+		} );
+	} );
+
+	test( 'User data for enhanced conversions is sent when enabled', async ( {
+		page,
+	} ) => {
+		await enableEnhancedConversions();
+		await singleProductAddToCart( page, simpleProductID );
+
+		const event = trackGtagEvent( page, 'conversion', 'checkout' );
 		await checkout( page );
 
 		await event.then( ( request ) => {
 			const data = getEventData( request );
-			expect( data.email ).toEqual( 'john.doe@example.com' );
+			expect( data.user_data.sha256_email_address ).toBeDefined();
 		} );
 	} );
 } );
diff --git a/tests/e2e/test-data/test-data.php b/tests/e2e/test-data/test-data.php
index 55de84dcaa..e116d5533d 100644
--- a/tests/e2e/test-data/test-data.php
+++ b/tests/e2e/test-data/test-data.php
@@ -49,6 +49,22 @@ function register_routes() {
 			],
 		],
 	);
+	register_rest_route(
+		'wc/v3',
+		'gla-test/enhanced-conversions',
+		[
+			[
+				'methods'             => 'POST',
+				'callback'            => __NAMESPACE__ . '\enable_enhanced_conversions',
+				'permission_callback' => __NAMESPACE__ . '\permissions',
+			],
+			[
+				'methods'             => 'DELETE',
+				'callback'            => __NAMESPACE__ . '\disable_enhanced_conversions',
+				'permission_callback' => __NAMESPACE__ . '\permissions',
+			],
+		],
+	);
 }
 
 /**
@@ -107,6 +123,30 @@ function clear_conversion_id() {
 	$options->delete( OptionsInterface::ADS_CONVERSION_ACTION );
 }
 
+/**
+ * Enable enhanced conversions.
+ */
+function enable_enhanced_conversions() {
+	/** @var OptionsInterface $options */
+	$options = woogle_get_container()->get( OptionsInterface::class );
+	$options->update(
+		OptionsInterface::ADS_ENHANCED_CONVERSION_STATUS,
+		'enabled'
+	);
+}
+
+/**
+ * Disable enhanced conversions.
+ */
+function disable_enhanced_conversions() {
+	/** @var OptionsInterface $options */
+	$options = woogle_get_container()->get( OptionsInterface::class );
+	$options->update(
+		OptionsInterface::ADS_ENHANCED_CONVERSION_STATUS,
+		'disabled'
+	);
+}
+
 /**
  * Check permissions for API requests.
  */
diff --git a/tests/e2e/utils/api.js b/tests/e2e/utils/api.js
index 4c1c2bca7c..ec8d1f0971 100644
--- a/tests/e2e/utils/api.js
+++ b/tests/e2e/utils/api.js
@@ -75,3 +75,17 @@ export async function setOnboardedMerchant() {
 export async function clearOnboardedMerchant() {
 	await api().delete( 'gla-test/onboarded-merchant' );
 }
+
+/**
+ * Enable Enhanced Conversions.
+ */
+export async function enableEnhancedConversions() {
+	await api().post( 'gla-test/enhanced-conversions' );
+}
+
+/**
+ * Disable Enhanced Conversions.
+ */
+export async function disableEnhancedConversions() {
+	await api().delete( 'gla-test/enhanced-conversions' );
+}

From 1afe1d565945d67c5f1b464258a08b9f2ce222e1 Mon Sep 17 00:00:00 2001
From: Joe McGill <joe.mcgill@10up.com>
Date: Fri, 15 Mar 2024 15:01:56 -0500
Subject: [PATCH 72/95] Remove E2E tests for now

---
 .../e2e/specs/gtag-events/gtag-events.test.js | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/tests/e2e/specs/gtag-events/gtag-events.test.js b/tests/e2e/specs/gtag-events/gtag-events.test.js
index 42bcd7dec1..c6a9030e87 100644
--- a/tests/e2e/specs/gtag-events/gtag-events.test.js
+++ b/tests/e2e/specs/gtag-events/gtag-events.test.js
@@ -10,7 +10,6 @@ import {
 	createSimpleProduct,
 	setConversionID,
 	clearConversionID,
-	enableEnhancedConversions,
 } from '../../utils/api';
 import {
 	blockProductAddToCart,
@@ -193,33 +192,4 @@ test.describe( 'GTag events', () => {
 			expect( data.country ).toEqual( 'US' );
 		} );
 	} );
-
-	test( 'User data for enhanced conversions are not sent when not enabled', async ( {
-		page,
-	} ) => {
-		await singleProductAddToCart( page, simpleProductID );
-
-		const event = trackGtagEvent( page, 'conversion', 'checkout' );
-		await checkout( page );
-
-		await event.then( ( request ) => {
-			const data = getEventData( request );
-			expect( data.user_data ).toBeUndefined();
-		} );
-	} );
-
-	test( 'User data for enhanced conversions is sent when enabled', async ( {
-		page,
-	} ) => {
-		await enableEnhancedConversions();
-		await singleProductAddToCart( page, simpleProductID );
-
-		const event = trackGtagEvent( page, 'conversion', 'checkout' );
-		await checkout( page );
-
-		await event.then( ( request ) => {
-			const data = getEventData( request );
-			expect( data.user_data.sha256_email_address ).toBeDefined();
-		} );
-	} );
 } );

From ce4441ee12ca452859b28e6d2faa57262289019b Mon Sep 17 00:00:00 2001
From: Joe McGill <joe.mcgill@10up.com>
Date: Fri, 15 Mar 2024 18:56:39 -0500
Subject: [PATCH 73/95] Add e2e tests

---
 .../e2e/specs/gtag-events/gtag-events.test.js | 44 ++++++++++++++++++-
 tests/e2e/utils/track-event.js                | 16 +++++++
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/specs/gtag-events/gtag-events.test.js b/tests/e2e/specs/gtag-events/gtag-events.test.js
index c6a9030e87..379bf4d87f 100644
--- a/tests/e2e/specs/gtag-events/gtag-events.test.js
+++ b/tests/e2e/specs/gtag-events/gtag-events.test.js
@@ -10,6 +10,8 @@ import {
 	createSimpleProduct,
 	setConversionID,
 	clearConversionID,
+	enableEnhancedConversions,
+	disableEnhancedConversions,
 } from '../../utils/api';
 import {
 	blockProductAddToCart,
@@ -18,7 +20,11 @@ import {
 	singleProductAddToCart,
 } from '../../utils/customer';
 import { createBlockShopPage } from '../../utils/block-page';
-import { getEventData, trackGtagEvent } from '../../utils/track-event';
+import {
+	getEventData,
+	trackGtagEvent,
+	getDataLayerValue,
+} from '../../utils/track-event';
 
 const config = require( '../../config/default' );
 const productPrice = config.products.simple.regularPrice;
@@ -28,6 +34,7 @@ let simpleProductID;
 test.describe( 'GTag events', () => {
 	test.beforeAll( async () => {
 		await setConversionID();
+		await enableEnhancedConversions();
 		simpleProductID = await createSimpleProduct();
 	} );
 
@@ -192,4 +199,39 @@ test.describe( 'GTag events', () => {
 			expect( data.country ).toEqual( 'US' );
 		} );
 	} );
+
+	test( 'User data for enhanced conversions are not sent when not enabled', async ( {
+		page,
+	} ) => {
+		await disableEnhancedConversions();
+		await singleProductAddToCart( page, simpleProductID );
+
+		await checkout( page );
+
+		const dataConfig = await getDataLayerValue( page, {
+			type: 'config',
+			key: 'AW-123456',
+		} );
+
+		expect( dataConfig.allow_enhanced_conversions ).toBeUndefined();
+	} );
+
+	test( 'User data for enhanced conversions is sent when enabled', async ( {
+		page,
+	} ) => {
+		await singleProductAddToCart( page, simpleProductID );
+
+		const dataConfig = await getDataLayerValue( page, {
+			type: 'config',
+			key: 'AW-123456',
+		} );
+
+		const dataUserData = await getDataLayerValue( page, {
+			type: 'set',
+			key: 'user_data',
+		} );
+
+		expect( dataConfig.allow_enhanced_conversions ).toBeTruthy();
+		expect( dataUserData.sha256_email_address ).toBeDefined();
+	} );
 } );
diff --git a/tests/e2e/utils/track-event.js b/tests/e2e/utils/track-event.js
index 84b6517b3b..be3b681db3 100644
--- a/tests/e2e/utils/track-event.js
+++ b/tests/e2e/utils/track-event.js
@@ -59,3 +59,19 @@ export function getEventData( request ) {
 
 	return data;
 }
+
+/**
+ * Find a value in the dataLayer
+ *
+ * @param page
+ * @param args
+ */
+export function getDataLayerValue( page, args ) {
+	return page.evaluate( ( { type, key } ) => {
+		return (
+			window.dataLayer.find(
+				( item ) => item[ 0 ] === type && item[ 1 ] === key
+			)[ 2 ] ?? null
+		);
+	}, args );
+}

From 84343aeb38aba48558bef166febde3ec0010ae52 Mon Sep 17 00:00:00 2001
From: Joe McGill <joe.mcgill@10up.com>
Date: Fri, 15 Mar 2024 19:01:59 -0500
Subject: [PATCH 74/95] Fix JSDoc errors

---
 tests/e2e/utils/track-event.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/utils/track-event.js b/tests/e2e/utils/track-event.js
index be3b681db3..5ade37a7fe 100644
--- a/tests/e2e/utils/track-event.js
+++ b/tests/e2e/utils/track-event.js
@@ -63,8 +63,8 @@ export function getEventData( request ) {
 /**
  * Find a value in the dataLayer
  *
- * @param page
- * @param args
+ * @param {Page} page
+ * @param {Object} args The type and key to search for.
  */
 export function getDataLayerValue( page, args ) {
 	return page.evaluate( ( { type, key } ) => {

From 8ee59b68cf985fd2642e0099abaf92b05dc9bfc5 Mon Sep 17 00:00:00 2001
From: Joe McGill <joe.mcgill@10up.com>
Date: Fri, 15 Mar 2024 19:05:42 -0500
Subject: [PATCH 75/95] Fix tests

---
 tests/e2e/specs/gtag-events/gtag-events.test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/e2e/specs/gtag-events/gtag-events.test.js b/tests/e2e/specs/gtag-events/gtag-events.test.js
index 379bf4d87f..0ae766fa58 100644
--- a/tests/e2e/specs/gtag-events/gtag-events.test.js
+++ b/tests/e2e/specs/gtag-events/gtag-events.test.js
@@ -221,6 +221,8 @@ test.describe( 'GTag events', () => {
 	} ) => {
 		await singleProductAddToCart( page, simpleProductID );
 
+		await checkout( page );
+
 		const dataConfig = await getDataLayerValue( page, {
 			type: 'config',
 			key: 'AW-123456',

From 72a2f2a2c265a9f3fc5cd1cd38a5707f51ffaa6f Mon Sep 17 00:00:00 2001
From: Joe McGill <joe.mcgill@10up.com>
Date: Sun, 17 Mar 2024 15:28:26 -0500
Subject: [PATCH 76/95] Enable EC for e2e test

---
 tests/e2e/specs/gtag-events/gtag-events.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/e2e/specs/gtag-events/gtag-events.test.js b/tests/e2e/specs/gtag-events/gtag-events.test.js
index 0ae766fa58..2de783fa96 100644
--- a/tests/e2e/specs/gtag-events/gtag-events.test.js
+++ b/tests/e2e/specs/gtag-events/gtag-events.test.js
@@ -219,6 +219,7 @@ test.describe( 'GTag events', () => {
 	test( 'User data for enhanced conversions is sent when enabled', async ( {
 		page,
 	} ) => {
+		await enableEnhancedConversions();
 		await singleProductAddToCart( page, simpleProductID );
 
 		await checkout( page );

From aaa28be8fb4d3c740ca7c15dce718afb22defe38 Mon Sep 17 00:00:00 2001
From: Joe McGill <joe.mcgill@10up.com>
Date: Sun, 17 Mar 2024 15:43:16 -0500
Subject: [PATCH 77/95] Make disabled test more robust

---
 tests/e2e/specs/gtag-events/gtag-events.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/e2e/specs/gtag-events/gtag-events.test.js b/tests/e2e/specs/gtag-events/gtag-events.test.js
index 2de783fa96..9e78c9434c 100644
--- a/tests/e2e/specs/gtag-events/gtag-events.test.js
+++ b/tests/e2e/specs/gtag-events/gtag-events.test.js
@@ -213,6 +213,7 @@ test.describe( 'GTag events', () => {
 			key: 'AW-123456',
 		} );
 
+		expect( dataConfig ).toBeDefined();
 		expect( dataConfig.allow_enhanced_conversions ).toBeUndefined();
 	} );
 

From 40a0e8eea47763c0c6b6547a3dc32603893a8e09 Mon Sep 17 00:00:00 2001
From: asvinb <asvin.balloo@gmail.com>
Date: Tue, 19 Mar 2024 19:30:59 +0400
Subject: [PATCH 78/95] Remove unused adsConnected property.

---
 jest.config.js                                |  1 -
 ...en-footer.js => dynamic-screen-actions.js} | 15 +++++-----
 .../dynamic-screen-content.js                 |  3 +-
 .../{footer.js => actions.js}                 |  4 +--
 .../{footer.test.js => actions.test.js}       |  8 ++---
 .../google-credits/{footer.js => actions.js}  |  4 +--
 .../submission-success-guide/index.js         | 13 +++------
 .../setup-success/footer.js                   | 29 -------------------
 src/Admin/Admin.php                           |  1 -
 9 files changed, 20 insertions(+), 58 deletions(-)
 rename js/src/product-feed/submission-success-guide/{dynamic-screen-footer.js => dynamic-screen-actions.js} (51%)
 rename js/src/product-feed/submission-success-guide/enhanced-conversion/{footer.js => actions.js} (94%)
 rename js/src/product-feed/submission-success-guide/enhanced-conversion/{footer.test.js => actions.test.js} (93%)
 rename js/src/product-feed/submission-success-guide/google-credits/{footer.js => actions.js} (93%)
 delete mode 100644 js/src/product-feed/submission-success-guide/setup-success/footer.js

diff --git a/jest.config.js b/jest.config.js
index 66ef3cadd0..935051d13a 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -47,7 +47,6 @@ module.exports = {
 			mcSupportedCountry: true,
 			mcSupportedLanguage: true,
 			adsSetupComplete: true,
-			adsConnected: true,
 			enableReports: true,
 			dateFormat: 'F j, Y',
 			timeFormat: 'g:i a',
diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js b/js/src/product-feed/submission-success-guide/dynamic-screen-actions.js
similarity index 51%
rename from js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
rename to js/src/product-feed/submission-success-guide/dynamic-screen-actions.js
index 428d0b7a07..0ef61b01cb 100644
--- a/js/src/product-feed/submission-success-guide/dynamic-screen-footer.js
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-actions.js
@@ -7,13 +7,12 @@ import { noop } from 'lodash';
 /**
  * Internal dependencies
  */
-import { glaData } from '.~/constants';
 import LoadingLabel from '.~/components/loading-label';
 import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
-import EnhancedConversionFooter from './enhanced-conversion/footer';
-import GoogleCreditsFooter from './google-credits/footer';
+import EnhancedConversionActions from './enhanced-conversion/actions';
+import GoogleCreditsActions from './google-credits/actions';
 
-const DynamicScreenFooter = ( { onModalClose = noop } ) => {
+const DynamicScreenActions = ( { onModalClose = noop } ) => {
 	const { loaded, pmaxCampaigns } = useAdsCampaigns();
 
 	if ( ! loaded ) {
@@ -25,11 +24,11 @@ const DynamicScreenFooter = ( { onModalClose = noop } ) => {
 		);
 	}
 
-	if ( pmaxCampaigns.length && glaData.adsConnected ) {
-		return <EnhancedConversionFooter onModalClose={ onModalClose } />;
+	if ( pmaxCampaigns.length ) {
+		return <EnhancedConversionActions onModalClose={ onModalClose } />;
 	}
 
-	return <GoogleCreditsFooter onModalClose={ onModalClose } />;
+	return <GoogleCreditsActions onModalClose={ onModalClose } />;
 };
 
-export default DynamicScreenFooter;
+export default DynamicScreenActions;
diff --git a/js/src/product-feed/submission-success-guide/dynamic-screen-content.js b/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
index d74796d7d3..25353f3f88 100644
--- a/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
+++ b/js/src/product-feed/submission-success-guide/dynamic-screen-content.js
@@ -6,7 +6,6 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { glaData } from '.~/constants';
 import LoadingLabel from '.~/components/loading-label';
 import GuidePageContent from '.~/components/guide-page-content';
 import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
@@ -26,7 +25,7 @@ const DynamicScreenContent = () => {
 		);
 	}
 
-	if ( pmaxCampaigns.length && glaData.adsConnected ) {
+	if ( pmaxCampaigns.length ) {
 		return <EnhancedConversion />;
 	}
 
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/actions.js
similarity index 94%
rename from js/src/product-feed/submission-success-guide/enhanced-conversion/footer.js
rename to js/src/product-feed/submission-success-guide/enhanced-conversion/actions.js
index cb10810f9e..fca858d639 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/actions.js
@@ -12,7 +12,7 @@ import useDispatchCoreNotices from '.~/hooks/useDispatchCoreNotices';
 import AppButton from '.~/components/app-button';
 import CTA from '.~/components/enhanced-conversion-tracking-settings/cta';
 
-const Footer = ( { onModalClose = noop } ) => {
+const Actions = ( { onModalClose = noop } ) => {
 	const { createNotice } = useDispatchCoreNotices();
 
 	const handleEnableOrDisableClick = useCallback( () => {
@@ -50,4 +50,4 @@ const Footer = ( { onModalClose = noop } ) => {
 	);
 };
 
-export default Footer;
+export default Actions;
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/actions.test.js
similarity index 93%
rename from js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
rename to js/src/product-feed/submission-success-guide/enhanced-conversion/actions.test.js
index 4fc7665fb9..6d40111483 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/footer.test.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/actions.test.js
@@ -43,7 +43,7 @@ import '@testing-library/jest-dom';
 import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
-import Footer from './footer';
+import Actions from './actions';
 
 describe( 'Enhanced Conversion Footer', () => {
 	beforeEach( () => {
@@ -59,7 +59,7 @@ describe( 'Enhanced Conversion Footer', () => {
 			allowEnhancedConversions: null,
 		} );
 
-		render( <Footer /> );
+		render( <Actions /> );
 
 		expect(
 			screen.getByText( 'Sign terms of service on Google Ads' )
@@ -77,7 +77,7 @@ describe( 'Enhanced Conversion Footer', () => {
 			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.DISABLED,
 		} );
 
-		render( <Footer onModalClose={ handleOnModalClose } /> );
+		render( <Actions onModalClose={ handleOnModalClose } /> );
 
 		const button = screen.getByRole( 'button', { name: 'Confirm' } );
 		userEvent.click( button );
@@ -96,7 +96,7 @@ describe( 'Enhanced Conversion Footer', () => {
 			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.ENABLED,
 		} );
 
-		render( <Footer onModalClose={ handleOnModalClose } /> );
+		render( <Actions onModalClose={ handleOnModalClose } /> );
 
 		const button = screen.getByRole( 'button', { name: 'Disable' } );
 		userEvent.click( button );
diff --git a/js/src/product-feed/submission-success-guide/google-credits/footer.js b/js/src/product-feed/submission-success-guide/google-credits/actions.js
similarity index 93%
rename from js/src/product-feed/submission-success-guide/google-credits/footer.js
rename to js/src/product-feed/submission-success-guide/google-credits/actions.js
index e94244102c..49bfc70817 100644
--- a/js/src/product-feed/submission-success-guide/google-credits/footer.js
+++ b/js/src/product-feed/submission-success-guide/google-credits/actions.js
@@ -13,7 +13,7 @@ import { GLA_MODAL_CLOSED_EVENT_NAME } from '../constants';
 import AppButton from '.~/components/app-button';
 import AddPaidCampaignButton from '.~/components/paid-ads/add-paid-campaign-button';
 
-const Footer = ( { onModalClose = noop } ) => {
+const Actions = ( { onModalClose = noop } ) => {
 	return (
 		<Fragment>
 			<div className="gla-submission-success-guide__space_holder" />
@@ -42,4 +42,4 @@ const Footer = ( { onModalClose = noop } ) => {
 	);
 };
 
-export default Footer;
+export default Actions;
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index 6e9ab7e53d..1556250a9c 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -8,16 +8,15 @@ import { getHistory } from '@woocommerce/navigation';
 /**
  * Internal dependencies
  */
-import { glaData, GUIDE_NAMES, LOCAL_STORAGE_KEYS } from '.~/constants';
+import { GUIDE_NAMES, LOCAL_STORAGE_KEYS } from '.~/constants';
 import { getProductFeedUrl } from '.~/utils/urls';
 import { recordGlaEvent } from '.~/utils/tracks';
 import { GLA_MODAL_CLOSED_EVENT_NAME } from './constants';
 import Guide from '.~/external-components/wordpress/guide';
 import localStorage from '.~/utils/localStorage';
 import DynamicScreenContent from './dynamic-screen-content';
-import DynamicScreenFooter from './dynamic-screen-footer';
+import DynamicScreenActions from './dynamic-screen-actions';
 import SetupSuccess from './setup-success';
-import SetupSuccessFooter from './setup-success/footer';
 import wooLogoURL from './woocommerce-logo.svg';
 import googleLogoURL from '.~/images/google-logo.svg';
 import './index.scss';
@@ -61,23 +60,19 @@ const handleGuideFinish = ( e ) => {
 	} );
 };
 
+// There will always be at least 2 pages because we will require a connected Ads account during onboarding.
 const pages = [
 	{
 		image,
 		content: <SetupSuccess />,
-		actions: <SetupSuccessFooter onModalClose={ handleGuideFinish } />,
 	},
 	{
 		image,
 		content: <DynamicScreenContent />,
-		actions: <DynamicScreenFooter onModalClose={ handleGuideFinish } />,
+		actions: <DynamicScreenActions onModalClose={ handleGuideFinish } />,
 	},
 ];
 
-if ( ! glaData.adsConnected ) {
-	pages.pop();
-}
-
 /**
  * Modal window to greet the user at Product Feed, after successful completion of onboarding.
  *
diff --git a/js/src/product-feed/submission-success-guide/setup-success/footer.js b/js/src/product-feed/submission-success-guide/setup-success/footer.js
deleted file mode 100644
index 62a64d8128..0000000000
--- a/js/src/product-feed/submission-success-guide/setup-success/footer.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * External dependencies
- */
-import { __ } from '@wordpress/i18n';
-import { noop } from 'lodash';
-
-/**
- * Internal dependencies
- */
-import { glaData } from '.~/constants';
-import AppButton from '.~/components/app-button';
-
-const Footer = ( { onModalClose = noop } ) => {
-	if ( glaData.adsConnected ) {
-		return null;
-	}
-
-	return (
-		<AppButton
-			isPrimary
-			data-action="view-product-feed"
-			onClick={ onModalClose }
-		>
-			{ __( 'View product feed', 'google-listings-and-ads' ) }
-		</AppButton>
-	);
-};
-
-export default Footer;
diff --git a/src/Admin/Admin.php b/src/Admin/Admin.php
index aa3d6d2000..07b6c31f27 100644
--- a/src/Admin/Admin.php
+++ b/src/Admin/Admin.php
@@ -137,7 +137,6 @@ protected function get_assets(): array {
 				'mcSupportedLanguage'      => $this->merchant_center->is_language_supported(),
 				'adsCampaignConvertStatus' => $this->options->get( OptionsInterface::CAMPAIGN_CONVERT_STATUS ),
 				'adsSetupComplete'         => $this->ads->is_setup_complete(),
-				'adsConnected'             => $this->ads->is_connected(),
 				'enableReports'            => $this->enableReports(),
 				'dateFormat'               => get_option( 'date_format' ),
 				'timeFormat'               => get_option( 'time_format' ),

From 35ab06ffba2b43b5cf4d17b3015e898cd59b6ba6 Mon Sep 17 00:00:00 2001
From: asvinb <asvin.balloo@gmail.com>
Date: Tue, 19 Mar 2024 20:15:30 +0400
Subject: [PATCH 79/95] Add useGoogleAdsTermsURL hook.

---
 .../cta.js                                    |  8 ++---
 .../pending-notice.js                         | 15 ++++------
 .../useOpenTermsURL.js                        | 16 ----------
 js/src/constants.js                           |  3 --
 js/src/data/action-types.js                   |  1 +
 js/src/data/reducer.js                        | 13 ++++++++
 js/src/data/selectors.js                      | 10 +++++++
 js/src/data/test/reducer.test.js              |  1 +
 js/src/hooks/useGoogleAdsTermsURL.js          | 30 +++++++++++++++++++
 9 files changed, 65 insertions(+), 32 deletions(-)
 delete mode 100644 js/src/components/enhanced-conversion-tracking-settings/useOpenTermsURL.js
 create mode 100644 js/src/hooks/useGoogleAdsTermsURL.js

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta.js b/js/src/components/enhanced-conversion-tracking-settings/cta.js
index dfd9eb6d71..4091eda27b 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta.js
@@ -14,7 +14,7 @@ import AppButton from '.~/components/app-button';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import useTermsPolling from './useTermsPolling';
-import useOpenTermsURL from './useOpenTermsURL';
+import useGoogleAdsEnhancedConversionTermsURL from '.~/hooks/useGoogleAdsTermsURL';
 
 const CTA = ( {
 	acceptTermsLabel = __(
@@ -30,19 +30,19 @@ const CTA = ( {
 	const { acceptedCustomerDataTerms, hasFinishedResolution } =
 		useAcceptedCustomerDataTerms();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
-	const { openTermsURL } = useOpenTermsURL();
+	const { url } = useGoogleAdsEnhancedConversionTermsURL();
 	useTermsPolling();
 
 	const handleTOS = useCallback(
 		( event ) => {
 			event.preventDefault();
 
-			openTermsURL();
+			window.open( url, '_blank' );
 			updateEnhancedAdsConversionStatus(
 				ENHANCED_ADS_CONVERSION_STATUS.PENDING
 			);
 		},
-		[ updateEnhancedAdsConversionStatus, openTermsURL ]
+		[ updateEnhancedAdsConversionStatus, url ]
 	);
 
 	const handleDisable = useCallback( () => {
diff --git a/js/src/components/enhanced-conversion-tracking-settings/pending-notice.js b/js/src/components/enhanced-conversion-tracking-settings/pending-notice.js
index 8728076e59..1fb49e8b8c 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/pending-notice.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/pending-notice.js
@@ -7,30 +7,27 @@ import { createInterpolateElement, useCallback } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import {
-	ENHANCED_ADS_TOS_BASE_URL,
-	ENHANCED_ADS_CONVERSION_STATUS,
-} from '.~/constants';
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import { useAppDispatch } from '.~/data';
 import TrackableLink from '.~/components/trackable-link';
 import useTermsPolling from './useTermsPolling';
-import useOpenTermsURL from './useOpenTermsURL';
+import useGoogleAdsEnhancedConversionTermsURL from '.~/hooks/useGoogleAdsTermsURL';
 
 const PendingNotice = () => {
 	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
-	const { openTermsURL } = useOpenTermsURL();
+	const { url } = useGoogleAdsEnhancedConversionTermsURL();
 	useTermsPolling();
 
 	const handleOnClick = useCallback(
 		( event ) => {
 			event.preventDefault();
 
-			openTermsURL();
+			window.open( url, '_blank' );
 			updateEnhancedAdsConversionStatus(
 				ENHANCED_ADS_CONVERSION_STATUS.PENDING
 			);
 		},
-		[ updateEnhancedAdsConversionStatus, openTermsURL ]
+		[ updateEnhancedAdsConversionStatus, url ]
 	);
 
 	return (
@@ -43,7 +40,7 @@ const PendingNotice = () => {
 				{
 					link: (
 						<TrackableLink
-							href={ ENHANCED_ADS_TOS_BASE_URL } // @todo: should deep link
+							href={ url }
 							target="_blank"
 							type="external"
 							eventName="gla_ads_tos" // @todo: review eventName
diff --git a/js/src/components/enhanced-conversion-tracking-settings/useOpenTermsURL.js b/js/src/components/enhanced-conversion-tracking-settings/useOpenTermsURL.js
deleted file mode 100644
index 82b461eba0..0000000000
--- a/js/src/components/enhanced-conversion-tracking-settings/useOpenTermsURL.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Internal dependencies
- */
-import { ENHANCED_ADS_TOS_BASE_URL } from '.~/constants';
-
-const useOpenTermsURL = () => {
-	// Extracted as hook for later we want to get the deep link
-	// @todo: Deeplink
-	const openTermsURL = () => {
-		window.open( ENHANCED_ADS_TOS_BASE_URL, '_blank' );
-	};
-
-	return { openTermsURL };
-};
-
-export default useOpenTermsURL;
diff --git a/js/src/constants.js b/js/src/constants.js
index 3d3009f0f9..46aa330a12 100644
--- a/js/src/constants.js
+++ b/js/src/constants.js
@@ -117,6 +117,3 @@ export const ENHANCED_ADS_CONVERSION_STATUS = {
 	ENABLED: 'enabled',
 	DISABLED: 'disabled',
 };
-
-export const ENHANCED_ADS_TOS_BASE_URL =
-	'https://ads.google.com/aw/conversions/customersettings';
diff --git a/js/src/data/action-types.js b/js/src/data/action-types.js
index 408b8d91ef..3d1630868c 100644
--- a/js/src/data/action-types.js
+++ b/js/src/data/action-types.js
@@ -52,6 +52,7 @@ const TYPES = {
 	RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS:
 		'RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS',
 	RECEIVE_ALLOW_ENHANCED_CONVERSIONS: 'RECEIVE_ALLOW_ENHANCED_CONVERSIONS',
+	RECEIVE_GOOGLE_ADS_OCID: 'RECEIVE_GOOGLE_ADS_OCID',
 };
 
 export default TYPES;
diff --git a/js/src/data/reducer.js b/js/src/data/reducer.js
index 3660047c9e..2c22c24115 100644
--- a/js/src/data/reducer.js
+++ b/js/src/data/reducer.js
@@ -65,6 +65,7 @@ const DEFAULT_STATE = {
 	store_categories: [],
 	tours: {},
 	ads: {
+		ocid: '123',
 		conversion_tracking_setting: {
 			accepted_customer_data_terms: null,
 			allow_enhanced_conversions: null,
@@ -525,6 +526,18 @@ const reducer = ( state = DEFAULT_STATE, action ) => {
 			);
 		}
 
+		case TYPES.RECEIVE_GOOGLE_ADS_OCID: {
+			const {
+				data: { ocid },
+			} = action;
+
+			if ( ocid === null || ocid === undefined ) {
+				return state;
+			}
+
+			return setIn( state, 'ads.ocid', ocid );
+		}
+
 		// Page will be reloaded after all accounts have been disconnected, so no need to mutate state.
 		case TYPES.DISCONNECT_ACCOUNTS_ALL:
 		default:
diff --git a/js/src/data/selectors.js b/js/src/data/selectors.js
index ed17eb5d72..aa68f8dfe8 100644
--- a/js/src/data/selectors.js
+++ b/js/src/data/selectors.js
@@ -420,3 +420,13 @@ export const getAcceptedCustomerDataTerms = ( state ) => {
 export const getAllowEnhancedConversions = ( state ) => {
 	return state.ads.conversion_tracking_setting.allow_enhanced_conversions;
 };
+
+/**
+ * Return the OCID for the user.
+ *
+ * @param {Object} state The state
+ * @return {string|null} It will be `null` if not yet fetched or fetched but doesn't exist.
+ */
+export const getGoogleAdsOcid = ( state ) => {
+	return state.ads.ocid;
+};
diff --git a/js/src/data/test/reducer.test.js b/js/src/data/test/reducer.test.js
index aad87910cd..0b7af3e0ee 100644
--- a/js/src/data/test/reducer.test.js
+++ b/js/src/data/test/reducer.test.js
@@ -68,6 +68,7 @@ describe( 'reducer', () => {
 			store_categories: [],
 			tours: {},
 			ads: {
+				ocid: null,
 				conversion_tracking_setting: {
 					accepted_customer_data_terms: null,
 					allow_enhanced_conversions: null,
diff --git a/js/src/hooks/useGoogleAdsTermsURL.js b/js/src/hooks/useGoogleAdsTermsURL.js
new file mode 100644
index 0000000000..fccf8c3c37
--- /dev/null
+++ b/js/src/hooks/useGoogleAdsTermsURL.js
@@ -0,0 +1,30 @@
+/**
+ * External dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { addQueryArgs } from '@wordpress/url';
+
+/**
+ * Internal dependencies
+ */
+import { STORE_KEY } from '.~/data/constants';
+
+export const ENHANCED_ADS_TERMS_BASE_URL =
+	'https://ads.google.com/aw/conversions/customersettings';
+
+const useGoogleAdsEnhancedConversionTermsURL = () => {
+	return useSelect( ( select ) => {
+		const ocid = select( STORE_KEY ).getGoogleAdsOcid();
+		const hasFinishedResolution =
+			select( STORE_KEY ).hasFinishedResolution( 'getGoogleAdsOcid' );
+
+		const url = addQueryArgs( ENHANCED_ADS_TERMS_BASE_URL, {
+			ocid,
+			eppn: 'customerDataTerms',
+		} );
+
+		return { url, hasFinishedResolution };
+	}, [] );
+};
+
+export default useGoogleAdsEnhancedConversionTermsURL;

From 5d6d8c1fb6e44ac436e6a6c7da1a38ea275e42c8 Mon Sep 17 00:00:00 2001
From: asvinb <asvin.balloo@gmail.com>
Date: Wed, 20 Mar 2024 12:43:49 +0400
Subject: [PATCH 80/95] Show button when EC is disabled.

---
 .../accept-terms.js                           | 43 +++++++++++++++++++
 .../cta.js                                    | 25 +----------
 .../index.js                                  | 25 ++++++++---
 .../enhanced-conversion/index.js              |  6 ---
 .../submission-success-guide/index.js         |  6 +++
 5 files changed, 71 insertions(+), 34 deletions(-)
 create mode 100644 js/src/components/enhanced-conversion-tracking-settings/accept-terms.js

diff --git a/js/src/components/enhanced-conversion-tracking-settings/accept-terms.js b/js/src/components/enhanced-conversion-tracking-settings/accept-terms.js
new file mode 100644
index 0000000000..fd0ce47a82
--- /dev/null
+++ b/js/src/components/enhanced-conversion-tracking-settings/accept-terms.js
@@ -0,0 +1,43 @@
+/**
+ * External dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useCallback } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
+import { useAppDispatch } from '.~/data';
+import AppButton from '.~/components/app-button';
+import useOpenTermsURL from './useOpenTermsURL';
+
+const AcceptTerms = ( {
+	acceptTermsLabel = __(
+		'Accept Terms & Conditions',
+		'google-listings-and-ads'
+	),
+} ) => {
+	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
+	const { openTermsURL } = useOpenTermsURL();
+
+	const handleAcceptTerms = useCallback(
+		( event ) => {
+			event.preventDefault();
+
+			openTermsURL();
+			updateEnhancedAdsConversionStatus(
+				ENHANCED_ADS_CONVERSION_STATUS.PENDING
+			);
+		},
+		[ updateEnhancedAdsConversionStatus, openTermsURL ]
+	);
+
+	return (
+		<AppButton isPrimary onClick={ handleAcceptTerms }>
+			{ acceptTermsLabel }
+		</AppButton>
+	);
+};
+
+export default AcceptTerms;
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta.js b/js/src/components/enhanced-conversion-tracking-settings/cta.js
index dfd9eb6d71..93a4f090c6 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta.js
@@ -11,16 +11,12 @@ import { useCallback } from '@wordpress/element';
 import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import { useAppDispatch } from '.~/data';
 import AppButton from '.~/components/app-button';
+import AcceptTerms from './accept-terms';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import useTermsPolling from './useTermsPolling';
-import useOpenTermsURL from './useOpenTermsURL';
 
 const CTA = ( {
-	acceptTermsLabel = __(
-		'Accept Terms & Conditions',
-		'google-listings-and-ads'
-	),
 	disableLabel = __( 'Disable', 'google-listings-and-ads' ),
 	enableLabel = __( 'Enable', 'google-listings-and-ads' ),
 	onEnableClick = noop,
@@ -30,21 +26,8 @@ const CTA = ( {
 	const { acceptedCustomerDataTerms, hasFinishedResolution } =
 		useAcceptedCustomerDataTerms();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
-	const { openTermsURL } = useOpenTermsURL();
 	useTermsPolling();
 
-	const handleTOS = useCallback(
-		( event ) => {
-			event.preventDefault();
-
-			openTermsURL();
-			updateEnhancedAdsConversionStatus(
-				ENHANCED_ADS_CONVERSION_STATUS.PENDING
-			);
-		},
-		[ updateEnhancedAdsConversionStatus, openTermsURL ]
-	);
-
 	const handleDisable = useCallback( () => {
 		if ( ! acceptedCustomerDataTerms ) {
 			return;
@@ -87,11 +70,7 @@ const CTA = ( {
 	}
 
 	if ( ! acceptedCustomerDataTerms ) {
-		return (
-			<AppButton isPrimary onClick={ handleTOS }>
-				{ acceptTermsLabel }
-			</AppButton>
-		);
+		return <AcceptTerms />;
 	}
 
 	if ( allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.ENABLED ) {
diff --git a/js/src/components/enhanced-conversion-tracking-settings/index.js b/js/src/components/enhanced-conversion-tracking-settings/index.js
index 4f4cfd4fcf..d21fcaff23 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/index.js
@@ -6,11 +6,14 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
+import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import useGoogleAdsAccount from '.~/hooks/useGoogleAdsAccount';
 import Section from '.~/wcdl/section';
 import PendingNotice from '.~/components/enhanced-conversion-tracking-settings/pending-notice';
+import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import Toggle from './toggle';
+import AcceptTerms from './accept-terms';
 
 const DESCRIPTION = (
 	<p>
@@ -29,19 +32,31 @@ const TITLE = __( 'Enhanced Conversion Tracking', 'google-listings-and-ads' );
 const EnhancedConversionTrackingSettings = () => {
 	const { googleAdsAccount } = useGoogleAdsAccount();
 	const { acceptedCustomerDataTerms } = useAcceptedCustomerDataTerms();
+	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 
 	if ( ! googleAdsAccount || ! googleAdsAccount.id ) {
 		return null;
 	}
 
+	const getCardBody = () => {
+		if (
+			! acceptedCustomerDataTerms &&
+			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
+		) {
+			return <PendingNotice />;
+		}
+
+		if ( ! acceptedCustomerDataTerms ) {
+			return <AcceptTerms />;
+		}
+
+		return <Toggle />;
+	};
+
 	return (
 		<Section title={ TITLE } description={ DESCRIPTION }>
 			<Section.Card>
-				<Section.Card.Body>
-					{ ! acceptedCustomerDataTerms && <PendingNotice /> }
-
-					<Toggle />
-				</Section.Card.Body>
+				<Section.Card.Body>{ getCardBody() }</Section.Card.Body>
 			</Section.Card>
 		</Section>
 	);
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
index 291fb88cf4..05ca22dfef 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
@@ -40,12 +40,6 @@ const EnhancedConversion = () => {
 				) }
 			</p>
 
-			{ ! hasFinishedResolution && (
-				<LoadingLabel
-					text={ __( 'Please wait…', 'google-listings-and-ads' ) }
-				/>
-			) }
-
 			{ hasAcceptedTerms === true && hasFinishedResolution && (
 				<p>
 					{ __(
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index 1556250a9c..aad8fa7e9e 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -19,6 +19,8 @@ import DynamicScreenActions from './dynamic-screen-actions';
 import SetupSuccess from './setup-success';
 import wooLogoURL from './woocommerce-logo.svg';
 import googleLogoURL from '.~/images/google-logo.svg';
+import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import './index.scss';
 
 const image = (
@@ -96,6 +98,10 @@ const SubmissionSuccessGuide = () => {
 		);
 	}, [] );
 
+	// Side effect to try to get the data we need for the modals as soon as possible.
+	useAcceptedCustomerDataTerms();
+	useAllowEnhancedConversions();
+
 	return (
 		<Guide
 			className="gla-submission-success-guide"

From a36070b0ac4d1dbf112a20cc89ac541f2634db8d Mon Sep 17 00:00:00 2001
From: asvinb <asvin.balloo@gmail.com>
Date: Wed, 20 Mar 2024 12:50:02 +0400
Subject: [PATCH 81/95] Fix js tests.

---
 js/src/components/enhanced-conversion-tracking-settings/cta.js | 3 ++-
 .../submission-success-guide/enhanced-conversion/index.js      | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta.js b/js/src/components/enhanced-conversion-tracking-settings/cta.js
index 93a4f090c6..4c5ee6b2e7 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta.js
@@ -17,6 +17,7 @@ import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import useTermsPolling from './useTermsPolling';
 
 const CTA = ( {
+	acceptTermsLabel,
 	disableLabel = __( 'Disable', 'google-listings-and-ads' ),
 	enableLabel = __( 'Enable', 'google-listings-and-ads' ),
 	onEnableClick = noop,
@@ -70,7 +71,7 @@ const CTA = ( {
 	}
 
 	if ( ! acceptedCustomerDataTerms ) {
-		return <AcceptTerms />;
+		return <AcceptTerms acceptTermsLabel={ acceptTermsLabel } />;
 	}
 
 	if ( allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.ENABLED ) {
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
index 05ca22dfef..52bd4270b3 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
@@ -8,7 +8,6 @@ import { createInterpolateElement } from '@wordpress/element';
  * Internal dependencies
  */
 import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
-import LoadingLabel from '.~/components/loading-label';
 import GuidePageContent from '.~/components/guide-page-content';
 import PendingNotice from '.~/components/enhanced-conversion-tracking-settings/pending-notice';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';

From 512f98560fdbfbc781da44451e67c10aedb13c35 Mon Sep 17 00:00:00 2001
From: asvinb <asvin.balloo@gmail.com>
Date: Wed, 20 Mar 2024 12:52:41 +0400
Subject: [PATCH 82/95] Remove unused prop.

---
 .../components/enhanced-conversion-tracking-settings/cta.js | 3 +--
 .../enhanced-conversion-tracking-settings/cta.test.js       | 6 ++----
 .../enhanced-conversion/actions.test.js                     | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta.js b/js/src/components/enhanced-conversion-tracking-settings/cta.js
index 4c5ee6b2e7..93a4f090c6 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta.js
@@ -17,7 +17,6 @@ import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import useTermsPolling from './useTermsPolling';
 
 const CTA = ( {
-	acceptTermsLabel,
 	disableLabel = __( 'Disable', 'google-listings-and-ads' ),
 	enableLabel = __( 'Enable', 'google-listings-and-ads' ),
 	onEnableClick = noop,
@@ -71,7 +70,7 @@ const CTA = ( {
 	}
 
 	if ( ! acceptedCustomerDataTerms ) {
-		return <AcceptTerms acceptTermsLabel={ acceptTermsLabel } />;
+		return <AcceptTerms />;
 	}
 
 	if ( allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.ENABLED ) {
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta.test.js b/js/src/components/enhanced-conversion-tracking-settings/cta.test.js
index 5ddf40c03b..7134be0a35 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta.test.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta.test.js
@@ -83,11 +83,9 @@ describe( 'Enhanced Conversion CTA', () => {
 			allowEnhancedConversions: null,
 		} );
 
-		render(
-			<CTA acceptTermsLabel="Sign terms of service on Google Ads" />
-		);
+		render( <CTA /> );
 		expect(
-			screen.getByText( 'Sign terms of service on Google Ads' )
+			screen.getByText( 'Accept Terms & Conditions' )
 		).toBeInTheDocument();
 	} );
 
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/actions.test.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/actions.test.js
index 6d40111483..cca4d7e007 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/actions.test.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/actions.test.js
@@ -62,7 +62,7 @@ describe( 'Enhanced Conversion Footer', () => {
 		render( <Actions /> );
 
 		expect(
-			screen.getByText( 'Sign terms of service on Google Ads' )
+			screen.getByText( 'Accept Terms & Conditions' )
 		).toBeInTheDocument();
 	} );
 

From 7e6044131e866bcda004912081cf8d00588acada Mon Sep 17 00:00:00 2001
From: asvinb <asvin.balloo@gmail.com>
Date: Wed, 20 Mar 2024 12:59:43 +0400
Subject: [PATCH 83/95] Add todo note for R1 PR.

---
 js/src/components/enhanced-conversion-tracking-settings/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/index.js b/js/src/components/enhanced-conversion-tracking-settings/index.js
index d21fcaff23..f9f95bcfc6 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/index.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/index.js
@@ -34,6 +34,7 @@ const EnhancedConversionTrackingSettings = () => {
 	const { acceptedCustomerDataTerms } = useAcceptedCustomerDataTerms();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 
+	// @todo: Remove condition once R1 PRs are merged since there should always be a connected Ads account.
 	if ( ! googleAdsAccount || ! googleAdsAccount.id ) {
 		return null;
 	}

From 7d60a3f06540b411a05b1646a8a8ef393f1fc161 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Wed, 20 Mar 2024 16:15:46 +0530
Subject: [PATCH 84/95] Add normalization for email address

User order object to add the data
---
 src/Google/GlobalSiteTag.php | 56 ++++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/Google/GlobalSiteTag.php b/src/Google/GlobalSiteTag.php
index de4c420dc4..eb22d7eb55 100644
--- a/src/Google/GlobalSiteTag.php
+++ b/src/Google/GlobalSiteTag.php
@@ -425,20 +425,27 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 		if ( $this->is_enhanced_conversion_enabled() ) {
 			// Enhanced conversion data.
 			$ec_data         = [];
-			$customer        = new WC_Customer( $order->get_customer_id() );
-			$email           = $customer->get_billing_email();
-			$fname           = $customer->get_billing_first_name();
-			$lname           = $customer->get_billing_last_name();
-			$phone           = $customer->get_billing_phone();
-			$billing_address = $customer->get_billing_address();
-			$postcode        = $customer->get_billing_postcode();
-			$city            = $customer->get_billing_city();
-			$region          = $customer->get_billing_state();
-			$country         = $customer->get_billing_country();
+			$email           = $order->get_billing_email();
+			$fname           = $order->get_billing_first_name();
+			$lname           = $order->get_billing_last_name();
+			$phone           = $order->get_billing_phone();
+			$billing_address = $order->get_billing_address_1();
+			$postcode        = $order->get_billing_postcode();
+			$city            = $order->get_billing_city();
+			$region          = $order->get_billing_state();
+			$country         = $order->get_billing_country();
 
 			// Add email in EC data.
 			if ( ! empty( $email ) ) {
-				$ec_data['sha256_email_address'] = $this->normalize_and_hash( $email );
+				$normalized_email = strtolower( $email );
+				$email_parts      = explode( '@', $normalized_email );
+
+				if ( count( $email_parts ) > 1 && preg_match( '/^(gmail|googlemail)\.com\s*/', $email_parts[1] ) ) {
+					$email_parts[0]   = str_replace( '.', '', $email_parts[0] );
+					$normalized_email = sprintf( '%s@%s', $email_parts[0], $email_parts[1] );
+				}
+
+				$ec_data['sha256_email_address'] = $this->normalize_and_hash( $normalized_email );
 			}
 
 			// Format phone number in IE64.
@@ -453,8 +460,8 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 			if ( ! empty( $fname ) && ! empty( $lname ) && ! empty( $postcode ) && ! empty( $country ) ) {
 				$ec_data['address']['sha256_first_name']  = $this->normalize_and_hash( $fname );
 				$ec_data['address']['sha256_last_name']   = $this->normalize_and_hash( $lname );
-				$ec_data['address']['sha256_postal_code'] = $this->normalize_and_hash( $postcode );
-				$ec_data['address']['sha256_country']     = $this->normalize_and_hash( $country );
+				$ec_data['address']['postal_code'] = $postcode;
+				$ec_data['address']['country']     = $country;
 
 				/**
 				 * Add additional data, if present.
@@ -462,17 +469,17 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 
 				// Add street address.
 				if ( ! empty( $billing_address ) ) {
-					$ec_data['address']['sha256_street'] = $this->normalize_and_hash( $billing_address );
+					$ec_data['address']['street'] = $billing_address;
 				}
 
 				// Add city.
 				if ( ! empty( $city ) ) {
-					$ec_data['address']['sha256_city'] = $this->normalize_and_hash( $city );
+					$ec_data['address']['city'] = $city;
 				}
 
 				// Add region.
 				if ( ! empty( $region ) ) {
-					$ec_data['address']['sha256_region'] = $this->normalize_and_hash( $region );
+					$ec_data['address']['region'] = $region;
 				}
 			}
 
@@ -684,20 +691,25 @@ private function is_enhanced_conversion_enabled(): bool {
 	 *
 	 * @param string $value Data that needs to be hashed.
 	 * @param string $algo  Algorithm for hashing.
+	 * @param bool   $trim_intermediate_spaces Whether to trim intermediate spaces in values. Default true.
 	 *
 	 * @return string
 	 */
-	private function normalize_and_hash( string $value, $algo = 'sha256' ): string {
+	private function normalize_and_hash( string $value, $algo = 'sha256', bool $trim_intermediate_spaces = true ): string {
 		if ( empty( $value ) ) {
 			return '';
 		}
 
-		// Remove leading and trailing whitespaces.
-		$value = trim( $value );
-
 		// Convert case to lowercase.
-		$value = strtolower( $value );
+		$normalized_value = strtolower( $value );
+
+		if ( $trim_intermediate_spaces ) {
+			$normalized_value = str_replace( ' ', '', $normalized_value );
+		} else {
+			// Remove leading and trailing whitespaces.
+			$normalized_value = trim( $normalized_value );
+		}
 
-		return hash( $algo, $value );
+		return hash( $algo, strtolower( trim( $normalized_value ) ) );
 	}
 }

From 41189ebb11502affc328e2d67d0b57b16e766aa7 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Wed, 20 Mar 2024 18:06:52 +0530
Subject: [PATCH 85/95] Add ocid in connection response

---
 src/Ads/AccountService.php            |  9 +++++---
 src/Options/OptionsInterface.php      |  2 ++
 tests/Unit/Ads/AccountServiceTest.php | 31 +++++++++++++++++++++++----
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/Ads/AccountService.php b/src/Ads/AccountService.php
index 832356a250..bebf302f12 100644
--- a/src/Ads/AccountService.php
+++ b/src/Ads/AccountService.php
@@ -74,12 +74,15 @@ public function get_accounts(): array {
 	 * @return array
 	 */
 	public function get_connected_account(): array {
-		$id = $this->options->get_ads_id();
+		$id       = $this->options->get_ads_id();
+		$ocid     = $this->options->get( OptionsInterface::ADS_ACCOUNT_OCID, '' );
+		$currency = $this->options->get( OptionsInterface::ADS_ACCOUNT_CURRENCY );
 
 		$status = [
 			'id'       => $id,
-			'currency' => $this->options->get( OptionsInterface::ADS_ACCOUNT_CURRENCY ),
-			'symbol'   => html_entity_decode( get_woocommerce_currency_symbol( $this->options->get( OptionsInterface::ADS_ACCOUNT_CURRENCY ) ) ),
+			'currency' => $currency,
+			'ocid'     => $ocid,
+			'symbol'   => html_entity_decode( get_woocommerce_currency_symbol( $currency ) ),
 			'status'   => $id ? 'connected' : 'disconnected',
 		];
 
diff --git a/src/Options/OptionsInterface.php b/src/Options/OptionsInterface.php
index f72e1fe73f..435e19231c 100644
--- a/src/Options/OptionsInterface.php
+++ b/src/Options/OptionsInterface.php
@@ -13,6 +13,7 @@
 interface OptionsInterface {
 
 	public const ADS_ACCOUNT_CURRENCY                      = 'ads_account_currency';
+	public const ADS_ACCOUNT_OCID                          = 'ads_account_ocid';
 	public const ADS_ACCOUNT_STATE                         = 'ads_account_state';
 	public const ADS_BILLING_URL                           = 'ads_billing_url';
 	public const ADS_CUSTOMER_DATA_TERMS                   = 'ads_customer_data_terms';
@@ -46,6 +47,7 @@ interface OptionsInterface {
 
 	public const VALID_OPTIONS = [
 		self::ADS_ACCOUNT_CURRENCY                      => true,
+		self::ADS_ACCOUNT_OCID                          => true,
 		self::ADS_ACCOUNT_STATE                         => true,
 		self::ADS_BILLING_URL                           => true,
 		self::ADS_CUSTOMER_DATA_TERMS                   => true,
diff --git a/tests/Unit/Ads/AccountServiceTest.php b/tests/Unit/Ads/AccountServiceTest.php
index 5ebf45fd5f..2703b08eb0 100644
--- a/tests/Unit/Ads/AccountServiceTest.php
+++ b/tests/Unit/Ads/AccountServiceTest.php
@@ -55,6 +55,7 @@ class AccountServiceTest extends UnitTest {
 	protected $options;
 
 	protected const TEST_ACCOUNT_ID        = 1234567890;
+	protected const TEST_ADS_OCID          = '123456789';
 	protected const TEST_OLD_ACCOUNT_ID    = 2345678901;
 	protected const TEST_MERCHANT_ID       = 78123456;
 	protected const TEST_BILLING_URL       = 'https://domain.test/billing/setup/';
@@ -76,12 +77,14 @@ class AccountServiceTest extends UnitTest {
 	protected const TEST_CONNECTED_DATA    = [
 		'id'       => self::TEST_ACCOUNT_ID,
 		'currency' => 'EUR',
+		'ocid'     => self::TEST_ADS_OCID,
 		'symbol'   => '€',
 		'status'   => 'connected',
 	];
 	protected const TEST_INCOMPLETE_DATA   = [
 		'id'       => self::TEST_ACCOUNT_ID,
 		'currency' => 'EUR',
+		'ocid'     => self::TEST_ADS_OCID,
 		'symbol'   => '€',
 		'status'   => 'incomplete',
 		'step'     => 'billing',
@@ -89,6 +92,7 @@ class AccountServiceTest extends UnitTest {
 	protected const TEST_DISCONNECTED_DATA = [
 		'id'       => 0,
 		'currency' => null,
+		'ocid'     => null,
 		'symbol'   => '$',
 		'status'   => 'disconnected',
 	];
@@ -146,20 +150,39 @@ public function test_get_connected_account() {
 			->willReturn( self::TEST_ACCOUNT_ID );
 
 		$this->options->method( 'get' )
-			->with( OptionsInterface::ADS_ACCOUNT_CURRENCY )
-			->willReturn( self::TEST_CURRENCY );
+			->withConsecutive(
+				[ OptionsInterface::ADS_ACCOUNT_OCID, '' ],
+				[ OptionsInterface::ADS_ACCOUNT_CURRENCY ],
+				[ OptionsInterface::ADS_ACCOUNT_CURRENCY ]
+			)
+			->willReturnOnConsecutiveCalls(
+				self::TEST_ADS_OCID,
+				self::TEST_CURRENCY,
+				self::TEST_CURRENCY
+			);
 
 		$this->assertEquals( self::TEST_CONNECTED_DATA, $this->account->get_connected_account() );
 	}
 
+	/**
+	 * @group failing
+	 */
 	public function test_get_connected_account_incomplete() {
 		$this->options->expects( $this->once() )
 			->method( 'get_ads_id' )
 			->willReturn( self::TEST_ACCOUNT_ID );
 
 		$this->options->method( 'get' )
-			->with( OptionsInterface::ADS_ACCOUNT_CURRENCY )
-			->willReturn( self::TEST_CURRENCY );
+			->withConsecutive(
+				[ OptionsInterface::ADS_ACCOUNT_OCID, '' ],
+				[ OptionsInterface::ADS_ACCOUNT_CURRENCY ],
+				[ OptionsInterface::ADS_ACCOUNT_CURRENCY ]
+			)
+			->willReturnOnConsecutiveCalls(
+				self::TEST_ADS_OCID,
+				self::TEST_CURRENCY,
+				self::TEST_CURRENCY
+			);
 
 		$this->state->expects( $this->once() )
 			->method( 'last_incomplete_step' )

From 95dc435acecf8a83df685f2ac24cf3de9cc32733 Mon Sep 17 00:00:00 2001
From: asvinb <asvin.balloo@gmail.com>
Date: Wed, 20 Mar 2024 17:04:40 +0400
Subject: [PATCH 86/95] Rename constant.

---
 .../accept-terms.js                                      | 6 ++----
 js/src/hooks/useGoogleAdsTermsURL.js                     | 9 +++------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/accept-terms.js b/js/src/components/enhanced-conversion-tracking-settings/accept-terms.js
index 005df8fd6e..9c5a1799f6 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/accept-terms.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/accept-terms.js
@@ -10,7 +10,6 @@ import { useCallback } from '@wordpress/element';
 import { ENHANCED_ADS_CONVERSION_STATUS } from '.~/constants';
 import { useAppDispatch } from '.~/data';
 import AppButton from '.~/components/app-button';
-import useOpenTermsURL from './useOpenTermsURL';
 import useGoogleAdsEnhancedConversionTermsURL from '.~/hooks/useGoogleAdsTermsURL';
 
 const AcceptTerms = ( {
@@ -21,18 +20,17 @@ const AcceptTerms = ( {
 } ) => {
 	const { url } = useGoogleAdsEnhancedConversionTermsURL();
 	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
-	const { openTermsURL } = useOpenTermsURL();
 
 	const handleAcceptTerms = useCallback(
 		( event ) => {
 			event.preventDefault();
 
-			window.open( url, '_blank');
+			window.open( url, '_blank' );
 			updateEnhancedAdsConversionStatus(
 				ENHANCED_ADS_CONVERSION_STATUS.PENDING
 			);
 		},
-		[ updateEnhancedAdsConversionStatus, openTermsURL ]
+		[ updateEnhancedAdsConversionStatus, url ]
 	);
 
 	return (
diff --git a/js/src/hooks/useGoogleAdsTermsURL.js b/js/src/hooks/useGoogleAdsTermsURL.js
index 5131bdde38..c4e457e94e 100644
--- a/js/src/hooks/useGoogleAdsTermsURL.js
+++ b/js/src/hooks/useGoogleAdsTermsURL.js
@@ -9,22 +9,19 @@ import { addQueryArgs } from '@wordpress/url';
  */
 import { STORE_KEY } from '.~/data/constants';
 
-export const ENHANCED_ADS_TERMS_BASE_URL =
+export const ENHANCED_CONVERSION_TERMS_BASE_URL =
 	'https://ads.google.com/aw/conversions/customersettings';
 
 const useGoogleAdsEnhancedConversionTermsURL = () => {
 	return useSelect( ( select ) => {
 		const adsAccount = select( STORE_KEY ).getGoogleAdsAccount();
-		const hasFinishedResolution = select( STORE_KEY ).hasFinishedResolution(
-			'getGoogleAdsAccount'
-		);
 
-		const url = addQueryArgs( ENHANCED_ADS_TERMS_BASE_URL, {
+		const url = addQueryArgs( ENHANCED_CONVERSION_TERMS_BASE_URL, {
 			ocid: adsAccount?.ocid,
 			eppn: 'customerDataTerms',
 		} );
 
-		return { url, hasFinishedResolution };
+		return { url };
 	}, [] );
 };
 

From b568996df1c5b922378af9e868eb649f2d932a0f Mon Sep 17 00:00:00 2001
From: asvinb <asvin.balloo@gmail.com>
Date: Wed, 20 Mar 2024 17:13:49 +0400
Subject: [PATCH 87/95] Remove unused code for grabbing the ocid via endpoint.

---
 js/src/data/action-types.js      |  1 -
 js/src/data/reducer.js           | 13 -------------
 js/src/data/selectors.js         | 10 ----------
 js/src/data/test/reducer.test.js |  1 -
 4 files changed, 25 deletions(-)

diff --git a/js/src/data/action-types.js b/js/src/data/action-types.js
index 3d1630868c..408b8d91ef 100644
--- a/js/src/data/action-types.js
+++ b/js/src/data/action-types.js
@@ -52,7 +52,6 @@ const TYPES = {
 	RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS:
 		'RECEIVE_ACCEPTED_CUSTOMER_DATA_TERMS',
 	RECEIVE_ALLOW_ENHANCED_CONVERSIONS: 'RECEIVE_ALLOW_ENHANCED_CONVERSIONS',
-	RECEIVE_GOOGLE_ADS_OCID: 'RECEIVE_GOOGLE_ADS_OCID',
 };
 
 export default TYPES;
diff --git a/js/src/data/reducer.js b/js/src/data/reducer.js
index 2c22c24115..3660047c9e 100644
--- a/js/src/data/reducer.js
+++ b/js/src/data/reducer.js
@@ -65,7 +65,6 @@ const DEFAULT_STATE = {
 	store_categories: [],
 	tours: {},
 	ads: {
-		ocid: '123',
 		conversion_tracking_setting: {
 			accepted_customer_data_terms: null,
 			allow_enhanced_conversions: null,
@@ -526,18 +525,6 @@ const reducer = ( state = DEFAULT_STATE, action ) => {
 			);
 		}
 
-		case TYPES.RECEIVE_GOOGLE_ADS_OCID: {
-			const {
-				data: { ocid },
-			} = action;
-
-			if ( ocid === null || ocid === undefined ) {
-				return state;
-			}
-
-			return setIn( state, 'ads.ocid', ocid );
-		}
-
 		// Page will be reloaded after all accounts have been disconnected, so no need to mutate state.
 		case TYPES.DISCONNECT_ACCOUNTS_ALL:
 		default:
diff --git a/js/src/data/selectors.js b/js/src/data/selectors.js
index aa68f8dfe8..ed17eb5d72 100644
--- a/js/src/data/selectors.js
+++ b/js/src/data/selectors.js
@@ -420,13 +420,3 @@ export const getAcceptedCustomerDataTerms = ( state ) => {
 export const getAllowEnhancedConversions = ( state ) => {
 	return state.ads.conversion_tracking_setting.allow_enhanced_conversions;
 };
-
-/**
- * Return the OCID for the user.
- *
- * @param {Object} state The state
- * @return {string|null} It will be `null` if not yet fetched or fetched but doesn't exist.
- */
-export const getGoogleAdsOcid = ( state ) => {
-	return state.ads.ocid;
-};
diff --git a/js/src/data/test/reducer.test.js b/js/src/data/test/reducer.test.js
index 0b7af3e0ee..aad87910cd 100644
--- a/js/src/data/test/reducer.test.js
+++ b/js/src/data/test/reducer.test.js
@@ -68,7 +68,6 @@ describe( 'reducer', () => {
 			store_categories: [],
 			tours: {},
 			ads: {
-				ocid: null,
 				conversion_tracking_setting: {
 					accepted_customer_data_terms: null,
 					allow_enhanced_conversions: null,

From 996286f5fcc51f70f8a34b4c47a16dfd5480f586 Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Wed, 20 Mar 2024 18:45:15 +0530
Subject: [PATCH 88/95] Remove redundant code

---
 src/API/Google/Ads.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index 74bc299b10..a838f30434 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -18,7 +18,6 @@
 use Google\Ads\GoogleAds\V14\Enums\MerchantCenterLinkStatusEnum\MerchantCenterLinkStatus;
 use Google\Ads\GoogleAds\V14\Resources\MerchantCenterLink;
 use Google\Ads\GoogleAds\V14\Services\MerchantCenterLinkOperation;
-use Google\Ads\GoogleAds\V14\Resources\ConversionTrackingSetting;
 use Google\ApiCore\ApiException;
 use Google\ApiCore\ValidationException;
 

From c2d73c25fadc8ad257a41c6635a7b8f1e947306b Mon Sep 17 00:00:00 2001
From: Joe McGill <joe.mcgill@10up.com>
Date: Wed, 20 Mar 2024 21:16:01 -0400
Subject: [PATCH 89/95] Remove hashing from non PII fields and fix merge

---
 src/Google/GlobalSiteTag.php | 109 ++++++++---------------------------
 1 file changed, 25 insertions(+), 84 deletions(-)

diff --git a/src/Google/GlobalSiteTag.php b/src/Google/GlobalSiteTag.php
index 772f5be3c6..d4c5ae286f 100644
--- a/src/Google/GlobalSiteTag.php
+++ b/src/Google/GlobalSiteTag.php
@@ -352,20 +352,27 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 		if ( $this->is_enhanced_conversion_enabled() ) {
 			// Enhanced conversion data.
 			$ec_data         = [];
-			$customer        = new WC_Customer( $order->get_customer_id() );
-			$email           = $customer->get_billing_email();
-			$fname           = $customer->get_billing_first_name();
-			$lname           = $customer->get_billing_last_name();
-			$phone           = $customer->get_billing_phone();
-			$billing_address = $customer->get_billing_address();
-			$postcode        = $customer->get_billing_postcode();
-			$city            = $customer->get_billing_city();
-			$region          = $customer->get_billing_state();
-			$country         = $customer->get_billing_country();
+			$email           = $order->get_billing_email();
+			$fname           = $order->get_billing_first_name();
+			$lname           = $order->get_billing_last_name();
+			$phone           = $order->get_billing_phone();
+			$billing_address = $order->get_billing_address_1();
+			$postcode        = $order->get_billing_postcode();
+			$city            = $order->get_billing_city();
+			$region          = $order->get_billing_state();
+			$country         = $order->get_billing_country();
 
 			// Add email in EC data.
 			if ( ! empty( $email ) ) {
-				$ec_data['sha256_email_address'] = $this->normalize_and_hash( $email );
+				$normalized_email = strtolower( $email );
+				$email_parts      = explode( '@', $normalized_email );
+
+				if ( count( $email_parts ) > 1 && preg_match( '/^(gmail|googlemail)\.com\s*/', $email_parts[1] ) ) {
+					$email_parts[0]   = str_replace( '.', '', $email_parts[0] );
+					$normalized_email = sprintf( '%s@%s', $email_parts[0], $email_parts[1] );
+				}
+
+				$ec_data['sha256_email_address'] = $this->normalize_and_hash( $normalized_email );
 			}
 
 			// Format phone number in IE64.
@@ -378,10 +385,10 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 
 			// Check for required address fields.
 			if ( ! empty( $fname ) && ! empty( $lname ) && ! empty( $postcode ) && ! empty( $country ) ) {
-				$ec_data['address']['sha256_first_name']  = $this->normalize_and_hash( $fname );
-				$ec_data['address']['sha256_last_name']   = $this->normalize_and_hash( $lname );
-				$ec_data['address']['sha256_postal_code'] = $this->normalize_and_hash( $postcode );
-				$ec_data['address']['sha256_country']     = $this->normalize_and_hash( $country );
+				$ec_data['address']['sha256_first_name'] = $this->normalize_and_hash( $fname );
+				$ec_data['address']['sha256_last_name']  = $this->normalize_and_hash( $lname );
+				$ec_data['address']['postal_code']       = $postcode;
+				$ec_data['address']['country']           = $country;
 
 				/**
 				 * Add additional data, if present.
@@ -389,17 +396,17 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 
 				// Add street address.
 				if ( ! empty( $billing_address ) ) {
-					$ec_data['address']['sha256_street'] = $this->normalize_and_hash( $billing_address );
+					$ec_data['address']['street'] = $billing_address;
 				}
 
 				// Add city.
 				if ( ! empty( $city ) ) {
-					$ec_data['address']['sha256_city'] = $this->normalize_and_hash( $city );
+					$ec_data['address']['city'] = $city;
 				}
 
 				// Add region.
 				if ( ! empty( $region ) ) {
-					$ec_data['address']['sha256_region'] = $this->normalize_and_hash( $region );
+					$ec_data['address']['region'] = $region;
 				}
 			}
 
@@ -483,72 +490,6 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 		);
 
 		$this->add_inline_event_script( $purchase_page_gtag );
-
-		if ( $this->is_enhanced_conversion_enabled() ) {
-			// Enhanced conversion data.
-			$ec_data         = [];
-			$email           = $order->get_billing_email();
-			$fname           = $order->get_billing_first_name();
-			$lname           = $order->get_billing_last_name();
-			$phone           = $order->get_billing_phone();
-			$billing_address = $order->get_billing_address_1();
-			$postcode        = $order->get_billing_postcode();
-			$city            = $order->get_billing_city();
-			$region          = $order->get_billing_state();
-			$country         = $order->get_billing_country();
-
-			// Add email in EC data.
-			if ( ! empty( $email ) ) {
-				$normalized_email = strtolower( $email );
-				$email_parts      = explode( '@', $normalized_email );
-
-				if ( count( $email_parts ) > 1 && preg_match( '/^(gmail|googlemail)\.com\s*/', $email_parts[1] ) ) {
-					$email_parts[0]   = str_replace( '.', '', $email_parts[0] );
-					$normalized_email = sprintf( '%s@%s', $email_parts[0], $email_parts[1] );
-				}
-
-				$ec_data['sha256_email_address'] = $this->normalize_and_hash( $normalized_email );
-			}
-
-			// Format phone number in IE64.
-			$phone        = preg_replace( '/[^0-9]/', '', $phone );
-			$phone_length = strlen( $phone );
-			if ( $phone_length > 9 && $phone_length < 14 ) {
-				$phone                          = sprintf( '%s%d', '+', $phone );
-				$ec_data['sha256_phone_number'] = $this->normalize_and_hash( $phone );
-			}
-
-			// Check for required address fields.
-			if ( ! empty( $fname ) && ! empty( $lname ) && ! empty( $postcode ) && ! empty( $country ) ) {
-				$ec_data['address']['sha256_first_name']  = $this->normalize_and_hash( $fname );
-				$ec_data['address']['sha256_last_name']   = $this->normalize_and_hash( $lname );
-				$ec_data['address']['postal_code'] = $postcode;
-				$ec_data['address']['country']     = $country;
-
-				/**
-				 * Add additional data, if present.
-				 */
-
-				// Add street address.
-				if ( ! empty( $billing_address ) ) {
-					$ec_data['address']['street'] = $billing_address;
-				}
-
-				// Add city.
-				if ( ! empty( $city ) ) {
-					$ec_data['address']['city'] = $city;
-				}
-
-				// Add region.
-				if ( ! empty( $region ) ) {
-					$ec_data['address']['region'] = $region;
-				}
-			}
-
-			$purchase_user_data_gtag = sprintf( 'gtag("set", "user_data", %s)', wp_json_encode( $ec_data ) );
-
-			$this->add_inline_event_script( $purchase_user_data_gtag );
-		}
 	}
 
 	/**

From 02a93037e0be868a794e9aa9e2cf5b4e82e5d0c8 Mon Sep 17 00:00:00 2001
From: asvinb <asvin.balloo@gmail.com>
Date: Thu, 21 Mar 2024 12:26:16 +0400
Subject: [PATCH 90/95] Add local state for pending status.

---
 .../accept-terms.js                            |  5 ++++-
 .../cta.js                                     | 18 +++++++++---------
 .../cta.test.js                                | 15 ---------------
 .../useTermsPolling.js                         |  7 +++++--
 js/src/hooks/useGoogleAdsTermsURL.js           |  2 +-
 5 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/accept-terms.js b/js/src/components/enhanced-conversion-tracking-settings/accept-terms.js
index 9c5a1799f6..832274b944 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/accept-terms.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/accept-terms.js
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { noop } from 'lodash';
 import { useCallback } from '@wordpress/element';
 
 /**
@@ -17,6 +18,7 @@ const AcceptTerms = ( {
 		'Accept Terms & Conditions',
 		'google-listings-and-ads'
 	),
+	onAcceptTerms = noop,
 } ) => {
 	const { url } = useGoogleAdsEnhancedConversionTermsURL();
 	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
@@ -29,8 +31,9 @@ const AcceptTerms = ( {
 			updateEnhancedAdsConversionStatus(
 				ENHANCED_ADS_CONVERSION_STATUS.PENDING
 			);
+			onAcceptTerms();
 		},
-		[ updateEnhancedAdsConversionStatus, url ]
+		[ updateEnhancedAdsConversionStatus, url, onAcceptTerms ]
 	);
 
 	return (
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta.js b/js/src/components/enhanced-conversion-tracking-settings/cta.js
index 93a4f090c6..9d42f4de0b 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta.js
@@ -3,7 +3,7 @@
  */
 import { noop } from 'lodash';
 import { __ } from '@wordpress/i18n';
-import { useCallback } from '@wordpress/element';
+import { useCallback, useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -22,11 +22,12 @@ const CTA = ( {
 	onEnableClick = noop,
 	onDisableClick = noop,
 } ) => {
+	const [ startBackgroundPoll, setStartBackgroundPoll ] = useState( false );
 	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
 	const { acceptedCustomerDataTerms, hasFinishedResolution } =
 		useAcceptedCustomerDataTerms();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
-	useTermsPolling();
+	useTermsPolling( startBackgroundPoll );
 
 	const handleDisable = useCallback( () => {
 		if ( ! acceptedCustomerDataTerms ) {
@@ -60,17 +61,16 @@ const CTA = ( {
 		onEnableClick,
 	] );
 
-	if (
-		! hasFinishedResolution ||
-		( ! acceptedCustomerDataTerms &&
-			allowEnhancedConversions ===
-				ENHANCED_ADS_CONVERSION_STATUS.PENDING )
-	) {
+	const handleOnAcceptTerms = () => {
+		setStartBackgroundPoll( true );
+	};
+
+	if ( ! hasFinishedResolution || startBackgroundPoll ) {
 		return <AppButton isSecondary disabled loading />;
 	}
 
 	if ( ! acceptedCustomerDataTerms ) {
-		return <AcceptTerms />;
+		return <AcceptTerms onAcceptTerms={ handleOnAcceptTerms } />;
 	}
 
 	if ( allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.ENABLED ) {
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta.test.js b/js/src/components/enhanced-conversion-tracking-settings/cta.test.js
index 7134be0a35..0ac85d5bcd 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta.test.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta.test.js
@@ -117,21 +117,6 @@ describe( 'Enhanced Conversion CTA', () => {
 		expect( screen.getByText( 'Disable tracking' ) ).toBeInTheDocument();
 	} );
 
-	test( 'Render a spinner when the status is set to pending', () => {
-		useAcceptedCustomerDataTerms.mockReturnValue( {
-			acceptedCustomerDataTerms: false,
-			hasFinishedResolution: true,
-		} );
-
-		useAllowEnhancedConversions.mockReturnValue( {
-			allowEnhancedConversions: ENHANCED_ADS_CONVERSION_STATUS.PENDING,
-		} );
-
-		render( <CTA /> );
-		const spinner = screen.getByRole( 'status', { name: 'spinner' } );
-		expect( spinner ).toBeInTheDocument();
-	} );
-
 	test( 'Click on accept TOS button callback', () => {
 		window.open = jest.fn();
 
diff --git a/js/src/components/enhanced-conversion-tracking-settings/useTermsPolling.js b/js/src/components/enhanced-conversion-tracking-settings/useTermsPolling.js
index 1f9e0fc5e8..268154ea26 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/useTermsPolling.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/useTermsPolling.js
@@ -12,7 +12,7 @@ import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms'
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import useAutoCheckEnhancedConversionTOS from '.~/hooks/useAutoCheckEnhancedConversionTOS';
 
-const useTermsPolling = () => {
+const useTermsPolling = ( startBackgroundPoll = false ) => {
 	const { invalidateResolution } = useAppDispatch();
 	const {
 		startEnhancedConversionTOSPolling,
@@ -24,7 +24,9 @@ const useTermsPolling = () => {
 	useEffect( () => {
 		if (
 			! acceptedCustomerDataTerms &&
-			allowEnhancedConversions === ENHANCED_ADS_CONVERSION_STATUS.PENDING
+			allowEnhancedConversions ===
+				ENHANCED_ADS_CONVERSION_STATUS.PENDING &&
+			startBackgroundPoll
 		) {
 			startEnhancedConversionTOSPolling();
 			return;
@@ -36,6 +38,7 @@ const useTermsPolling = () => {
 		allowEnhancedConversions,
 		startEnhancedConversionTOSPolling,
 		stopEnhancedConversionTOSPolling,
+		startBackgroundPoll,
 	] );
 
 	useEffect( () => {
diff --git a/js/src/hooks/useGoogleAdsTermsURL.js b/js/src/hooks/useGoogleAdsTermsURL.js
index c4e457e94e..408c5dc616 100644
--- a/js/src/hooks/useGoogleAdsTermsURL.js
+++ b/js/src/hooks/useGoogleAdsTermsURL.js
@@ -17,7 +17,7 @@ const useGoogleAdsEnhancedConversionTermsURL = () => {
 		const adsAccount = select( STORE_KEY ).getGoogleAdsAccount();
 
 		const url = addQueryArgs( ENHANCED_CONVERSION_TERMS_BASE_URL, {
-			ocid: adsAccount?.ocid,
+			ocid: adsAccount?.ocid || 0,
 			eppn: 'customerDataTerms',
 		} );
 

From f8242052c649a810b930d81fc39089179e0972a5 Mon Sep 17 00:00:00 2001
From: Joe McGill <joe.mcgill@10up.com>
Date: Thu, 21 Mar 2024 11:36:13 -0400
Subject: [PATCH 91/95] Global Site Tag: Move EC data to private method

---
 src/Google/GlobalSiteTag.php | 130 ++++++++++++++++++-----------------
 1 file changed, 67 insertions(+), 63 deletions(-)

diff --git a/src/Google/GlobalSiteTag.php b/src/Google/GlobalSiteTag.php
index 48e57cd076..c7491435fd 100644
--- a/src/Google/GlobalSiteTag.php
+++ b/src/Google/GlobalSiteTag.php
@@ -350,69 +350,7 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 
 		// Prepare and enqueue the enhanced conversion data, if enabled.
 		if ( $this->is_enhanced_conversion_enabled() ) {
-			// Enhanced conversion data.
-			$ec_data         = [];
-			$email           = $order->get_billing_email();
-			$fname           = $order->get_billing_first_name();
-			$lname           = $order->get_billing_last_name();
-			$phone           = $order->get_billing_phone();
-			$billing_address = $order->get_billing_address_1();
-			$postcode        = $order->get_billing_postcode();
-			$city            = $order->get_billing_city();
-			$region          = $order->get_billing_state();
-			$country         = $order->get_billing_country();
-
-			// Add email in EC data.
-			if ( ! empty( $email ) ) {
-				$normalized_email = strtolower( $email );
-				$email_parts      = explode( '@', $normalized_email );
-
-				if ( count( $email_parts ) > 1 && preg_match( '/^(gmail|googlemail)\.com\s*/', $email_parts[1] ) ) {
-					$email_parts[0]   = str_replace( '.', '', $email_parts[0] );
-					$normalized_email = sprintf( '%s@%s', $email_parts[0], $email_parts[1] );
-				}
-
-				$ec_data['sha256_email_address'] = $this->normalize_and_hash( $normalized_email );
-			}
-
-			// Format phone number in IE64.
-			$phone        = preg_replace( '/[^0-9]/', '', $phone );
-			$phone_length = strlen( $phone );
-			if ( $phone_length > 9 && $phone_length < 14 ) {
-				$phone                          = sprintf( '%s%d', '+', $phone );
-				$ec_data['sha256_phone_number'] = $this->normalize_and_hash( $phone );
-			}
-
-			// Check for required address fields.
-			if ( ! empty( $fname ) && ! empty( $lname ) && ! empty( $postcode ) && ! empty( $country ) ) {
-				$ec_data['address']['sha256_first_name'] = $this->normalize_and_hash( $fname );
-				$ec_data['address']['sha256_last_name']  = $this->normalize_and_hash( $lname );
-				$ec_data['address']['postal_code']       = $postcode;
-				$ec_data['address']['country']           = $country;
-
-				/**
-				 * Add additional data, if present.
-				 */
-
-				// Add street address.
-				if ( ! empty( $billing_address ) ) {
-					$ec_data['address']['street'] = $billing_address;
-				}
-
-				// Add city.
-				if ( ! empty( $city ) ) {
-					$ec_data['address']['city'] = $city;
-				}
-
-				// Add region.
-				if ( ! empty( $region ) ) {
-					$ec_data['address']['region'] = $region;
-				}
-			}
-
-			$purchase_user_data_gtag = sprintf( 'gtag("set", "user_data", %s)', wp_json_encode( $ec_data ) );
-
-			$this->add_inline_event_script( $purchase_user_data_gtag );
+			$this->add_enhanced_conversion_data( $order );
 		}
 
 		$conversion_gtag_info =
@@ -492,6 +430,72 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 		$this->add_inline_event_script( $purchase_page_gtag );
 	}
 
+	private function add_enhanced_conversion_data( $order ) {
+		// Enhanced conversion data.
+		$ec_data         = [];
+		$email           = $order->get_billing_email();
+		$fname           = $order->get_billing_first_name();
+		$lname           = $order->get_billing_last_name();
+		$phone           = $order->get_billing_phone();
+		$billing_address = $order->get_billing_address_1();
+		$postcode        = $order->get_billing_postcode();
+		$city            = $order->get_billing_city();
+		$region          = $order->get_billing_state();
+		$country         = $order->get_billing_country();
+
+		// Add email in EC data.
+		if ( ! empty( $email ) ) {
+			$normalized_email = strtolower( $email );
+			$email_parts      = explode( '@', $normalized_email );
+
+			if ( count( $email_parts ) > 1 && preg_match( '/^(gmail|googlemail)\.com\s*/', $email_parts[1] ) ) {
+				$email_parts[0]   = str_replace( '.', '', $email_parts[0] );
+				$normalized_email = sprintf( '%s@%s', $email_parts[0], $email_parts[1] );
+			}
+
+			$ec_data['sha256_email_address'] = $this->normalize_and_hash( $normalized_email );
+		}
+
+		// Format phone number in IE64.
+		$phone        = preg_replace( '/[^0-9]/', '', $phone );
+		$phone_length = strlen( $phone );
+		if ( $phone_length > 9 && $phone_length < 14 ) {
+			$phone                          = sprintf( '%s%d', '+', $phone );
+			$ec_data['sha256_phone_number'] = $this->normalize_and_hash( $phone );
+		}
+
+		// Check for required address fields.
+		if ( ! empty( $fname ) && ! empty( $lname ) && ! empty( $postcode ) && ! empty( $country ) ) {
+			$ec_data['address']['sha256_first_name'] = $this->normalize_and_hash( $fname );
+			$ec_data['address']['sha256_last_name']  = $this->normalize_and_hash( $lname );
+			$ec_data['address']['postal_code']       = $postcode;
+			$ec_data['address']['country']           = $country;
+
+			/**
+			 * Add additional data, if present.
+			 */
+
+			// Add street address.
+			if ( ! empty( $billing_address ) ) {
+				$ec_data['address']['sha256_street'] = $this->normalize_and_hash( $billing_address );
+			}
+
+			// Add city.
+			if ( ! empty( $city ) ) {
+				$ec_data['address']['city'] = $city;
+			}
+
+			// Add region.
+			if ( ! empty( $region ) ) {
+				$ec_data['address']['region'] = $region;
+			}
+		}
+
+		$purchase_user_data_gtag = sprintf( 'gtag("set", "user_data", %s)', wp_json_encode( $ec_data ) );
+
+		$this->add_inline_event_script( $purchase_user_data_gtag );
+	}
+
 	/**
 	 * Display the JavaScript code to track the product view page.
 	 */

From 5ac23ecaa8efff799006ea119cc0a9c9e4c799bd Mon Sep 17 00:00:00 2001
From: Joe McGill <joe.mcgill@10up.com>
Date: Thu, 21 Mar 2024 11:41:05 -0400
Subject: [PATCH 92/95] Add docblock

---
 src/Google/GlobalSiteTag.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Google/GlobalSiteTag.php b/src/Google/GlobalSiteTag.php
index c7491435fd..7ce4e3d440 100644
--- a/src/Google/GlobalSiteTag.php
+++ b/src/Google/GlobalSiteTag.php
@@ -430,6 +430,11 @@ public function maybe_display_conversion_and_purchase_event_snippets( string $ad
 		$this->add_inline_event_script( $purchase_page_gtag );
 	}
 
+	/**
+	 * Add enhanced conversion data to the page.
+	 *
+	 * @param WC_Order $order The order object.
+	 */
 	private function add_enhanced_conversion_data( $order ) {
 		// Enhanced conversion data.
 		$ec_data         = [];

From cde898f6bca9de9af287b98aa7b5e8877b73da13 Mon Sep 17 00:00:00 2001
From: Joe McGill <joe.mcgill@10up.com>
Date: Thu, 21 Mar 2024 13:29:36 -0400
Subject: [PATCH 93/95] Improve loading of EC success modal

This adds another side effect to get the campaigns data needed to show the correct 2nd page and removes several instances of loading UI when a selector is resolving. This also adds a new side effect to the CTA when accepting terms that will turn off polling once we've determined that the user has accepted the terms, so the Enable button will be shown.
---
 .../cta.js                                    | 13 ++++--
 .../enhanced-conversion/index.js              | 40 +++++++++----------
 .../submission-success-guide/index.js         |  4 +-
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta.js b/js/src/components/enhanced-conversion-tracking-settings/cta.js
index 9d42f4de0b..328d417edf 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta.js
@@ -15,6 +15,7 @@ import AcceptTerms from './accept-terms';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import useTermsPolling from './useTermsPolling';
+import { useEffect } from 'react';
 
 const CTA = ( {
 	disableLabel = __( 'Disable', 'google-listings-and-ads' ),
@@ -24,8 +25,7 @@ const CTA = ( {
 } ) => {
 	const [ startBackgroundPoll, setStartBackgroundPoll ] = useState( false );
 	const { updateEnhancedAdsConversionStatus } = useAppDispatch();
-	const { acceptedCustomerDataTerms, hasFinishedResolution } =
-		useAcceptedCustomerDataTerms();
+	const { acceptedCustomerDataTerms } = useAcceptedCustomerDataTerms();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 	useTermsPolling( startBackgroundPoll );
 
@@ -45,6 +45,13 @@ const CTA = ( {
 		onDisableClick,
 	] );
 
+	// Turn off polling when the user has accepted the terms.
+	useEffect( () => {
+		if ( acceptedCustomerDataTerms && startBackgroundPoll ) {
+			setStartBackgroundPoll( false );
+		}
+	}, [ acceptedCustomerDataTerms, startBackgroundPoll ] );
+
 	const handleEnable = useCallback( () => {
 		if ( ! acceptedCustomerDataTerms ) {
 			return;
@@ -65,7 +72,7 @@ const CTA = ( {
 		setStartBackgroundPoll( true );
 	};
 
-	if ( ! hasFinishedResolution || startBackgroundPoll ) {
+	if ( startBackgroundPoll ) {
 		return <AppButton isSecondary disabled loading />;
 	}
 
diff --git a/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
index 52bd4270b3..b0c5c750ee 100644
--- a/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
+++ b/js/src/product-feed/submission-success-guide/enhanced-conversion/index.js
@@ -14,10 +14,8 @@ import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms'
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 
 const EnhancedConversion = () => {
-	const {
-		acceptedCustomerDataTerms: hasAcceptedTerms,
-		hasFinishedResolution,
-	} = useAcceptedCustomerDataTerms();
+	const { acceptedCustomerDataTerms: hasAcceptedTerms } =
+		useAcceptedCustomerDataTerms();
 	const { allowEnhancedConversions } = useAllowEnhancedConversions();
 
 	return (
@@ -38,28 +36,30 @@ const EnhancedConversion = () => {
 					}
 				) }
 			</p>
-
-			{ hasAcceptedTerms === true && hasFinishedResolution && (
+			{ hasAcceptedTerms &&
+			allowEnhancedConversions !==
+				ENHANCED_ADS_CONVERSION_STATUS.ENABLED ? (
 				<p>
 					{ __(
 						'Clicking confirm will enable Enhanced Conversions on your account and update your tags accordingly. This feature can also be managed from Google Listings & Ads > Settings',
 						'google-listings-and-ads'
 					) }
 				</p>
-			) }
-
-			{ hasAcceptedTerms === false && hasFinishedResolution && (
-				<p>
-					{ __(
-						'Activating it is easy – just agree to the terms of service on Google Ads and we will make the tagging changes needed for you. This feature can also be managed from Google Listings & Ads > Settings',
-						'google-listings-and-ads'
-					) }
-				</p>
-			) }
-
-			{ allowEnhancedConversions ===
-				ENHANCED_ADS_CONVERSION_STATUS.PENDING &&
-				! hasAcceptedTerms && <PendingNotice /> }
+			) : null }
+			{ ! hasAcceptedTerms ? (
+				<>
+					<p>
+						{ __(
+							'Activating it is easy – just agree to the terms of service on Google Ads and we will make the tagging changes needed for you. This feature can also be managed from Google Listings & Ads > Settings',
+							'google-listings-and-ads'
+						) }
+					</p>
+					{ allowEnhancedConversions ===
+					ENHANCED_ADS_CONVERSION_STATUS.PENDING ? (
+						<PendingNotice />
+					) : null }
+				</>
+			) : null }
 		</GuidePageContent>
 	);
 };
diff --git a/js/src/product-feed/submission-success-guide/index.js b/js/src/product-feed/submission-success-guide/index.js
index aad8fa7e9e..923d053917 100644
--- a/js/src/product-feed/submission-success-guide/index.js
+++ b/js/src/product-feed/submission-success-guide/index.js
@@ -20,6 +20,7 @@ import SetupSuccess from './setup-success';
 import wooLogoURL from './woocommerce-logo.svg';
 import googleLogoURL from '.~/images/google-logo.svg';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
+import useAdsCampaigns from '.~/hooks/useAdsCampaigns';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import './index.scss';
 
@@ -98,7 +99,8 @@ const SubmissionSuccessGuide = () => {
 		);
 	}, [] );
 
-	// Side effect to try to get the data we need for the modals as soon as possible.
+	// Side effects to try to get the data we need for the modals as soon as possible.
+	useAdsCampaigns();
 	useAcceptedCustomerDataTerms();
 	useAllowEnhancedConversions();
 

From 33f835a016415b21a8ec98e7582c613ffabb820b Mon Sep 17 00:00:00 2001
From: Joe McGill <joe.mcgill@10up.com>
Date: Thu, 21 Mar 2024 13:41:03 -0400
Subject: [PATCH 94/95] Fix tests and linting

---
 .../enhanced-conversion-tracking-settings/cta.js  |  3 +--
 .../cta.test.js                                   | 15 ---------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta.js b/js/src/components/enhanced-conversion-tracking-settings/cta.js
index 328d417edf..dc2ff94adf 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta.js
@@ -3,7 +3,7 @@
  */
 import { noop } from 'lodash';
 import { __ } from '@wordpress/i18n';
-import { useCallback, useState } from '@wordpress/element';
+import { useCallback, useState, useEffect } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -15,7 +15,6 @@ import AcceptTerms from './accept-terms';
 import useAcceptedCustomerDataTerms from '.~/hooks/useAcceptedCustomerDataTerms';
 import useAllowEnhancedConversions from '.~/hooks/useAllowEnhancedConversions';
 import useTermsPolling from './useTermsPolling';
-import { useEffect } from 'react';
 
 const CTA = ( {
 	disableLabel = __( 'Disable', 'google-listings-and-ads' ),
diff --git a/js/src/components/enhanced-conversion-tracking-settings/cta.test.js b/js/src/components/enhanced-conversion-tracking-settings/cta.test.js
index 0ac85d5bcd..614a4002a5 100644
--- a/js/src/components/enhanced-conversion-tracking-settings/cta.test.js
+++ b/js/src/components/enhanced-conversion-tracking-settings/cta.test.js
@@ -58,21 +58,6 @@ describe( 'Enhanced Conversion CTA', () => {
 		jest.clearAllMocks();
 	} );
 
-	test( 'When not yet loaded, should render a loading spinner', () => {
-		useAcceptedCustomerDataTerms.mockReturnValue( {
-			acceptedCustomerDataTerms: false,
-			hasFinishedResolution: false,
-		} );
-
-		useAllowEnhancedConversions.mockReturnValue( {
-			allowEnhancedConversions: null,
-		} );
-
-		render( <CTA /> );
-		const spinner = screen.getByRole( 'status', { name: 'spinner' } );
-		expect( spinner ).toBeInTheDocument();
-	} );
-
 	test( 'Prompt the user to sign the TOS', () => {
 		useAcceptedCustomerDataTerms.mockReturnValue( {
 			acceptedCustomerDataTerms: false,

From e08cbf04ce0ae4db4bf26727dec5c118f0c095fc Mon Sep 17 00:00:00 2001
From: Ankit Gade <ankit.gade@10up.com>
Date: Tue, 26 Mar 2024 18:44:14 +0530
Subject: [PATCH 95/95] Fix: fatal error when ads account disconnected

---
 src/API/Google/Ads.php                                   | 7 +++++--
 .../API/Site/Controllers/Ads/AccountControllerTest.php   | 9 +++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/API/Google/Ads.php b/src/API/Google/Ads.php
index a838f30434..b3119cc519 100644
--- a/src/API/Google/Ads.php
+++ b/src/API/Google/Ads.php
@@ -333,6 +333,11 @@ private function get_merchant_link( int $merchant_id ): MerchantCenterLink {
 	public function get_accepted_customer_data_terms(): bool {
 		$ads_id = $this->options->get_ads_id();
 
+		// Return if no ads id present.
+		if ( ! $ads_id ) {
+			return false;
+		}
+
 		try {
 			$accepted_terms = $this->options->get( OptionsInterface::ADS_CUSTOMER_DATA_TERMS, null );
 
@@ -374,8 +379,6 @@ public function get_accepted_customer_data_terms(): bool {
 	 * @return string
 	 */
 	public function update_enhanced_conversion_status( string $status ): string {
-		$status = strtolower( $status );
-
 		$this->options->update( OptionsInterface::ADS_ENHANCED_CONVERSION_STATUS, $status );
 
 		return $status;
diff --git a/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php b/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
index fa03b36a23..377d0e4af5 100644
--- a/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
+++ b/tests/Unit/API/Site/Controllers/Ads/AccountControllerTest.php
@@ -258,6 +258,15 @@ public function test_get_enhanced_conversion_status() {
 		$this->assertEquals( $expected_response, $response->get_data() );
 	}
 
+	public function test_update_enhanced_conversion_status_only_accepts_lowercase_arg() {
+		$response = $this->do_request( self::ROUTE_UPDATED_EC_STATUS, 'POST', [ 'status' => 'PENDING' ] );
+
+		$data = $response->get_data();
+
+		$this->assertEquals( 400, $response->get_status() );
+		$this->assertEquals( $data['code'], 'rest_invalid_param' );
+	}
+
 	/**
 	 * Test a Google disconnected error since it's a dependency for a connected Ads account.
 	 */