Move success notice to GA Account card

js/src/components/google-ads-account-card/connected-google-ads-account-card.js

@@ -3,7 +3,7 @@
  */
 import { __ } from '@wordpress/i18n';
 import { useState } from '@wordpress/element';
-import { ExternalLink, Notice } from '@wordpress/components';
+import { ExternalLink } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -14,7 +14,6 @@ import AccountCard, { APPEARANCE } from '.~/components/account-card';
 import ConnectedIconLabel from '.~/components/connected-icon-label';
 import AppButton from '.~/components/app-button';
 import Section from '.~/wcdl/section';
-import useMCSetup from '.~/hooks/useMCSetup';
 
 /**
  * Renders a Google Ads account card UI with connected account information.
@@ -33,9 +32,6 @@ export default function ConnectedGoogleAdsAccountCard( {
 } ) {
 	const { disconnectGoogleAdsAccount } = useAppDispatch();
 	const [ isDisconnecting, setDisconnecting ] = useState( false );
-	const { data: mcSetup } = useMCSetup();
-
-	const { status = '' } = mcSetup || {};
 
 	const handleSwitch = () => {
 		setDisconnecting( true );
@@ -48,28 +44,15 @@ export default function ConnectedGoogleAdsAccountCard( {
 		<AccountCard
 			appearance={ APPEARANCE.GOOGLE_ADS }
 			description={
-				<>
-					<ExternalLink href="https://ads.google.com/aw/overview">
-						{ toAccountText( googleAdsAccount.id ) }
-					</ExternalLink>
-				</>
+				<ExternalLink href="https://ads.google.com/aw/overview">
+					{ toAccountText( googleAdsAccount.id ) }
+				</ExternalLink>
 			}
 			indicator={ <ConnectedIconLabel /> }
 			{ ...restProps }
 		>
 			{ children }
 
-			{ status !== 'complete' && (
-				<Notice status="success" isDismissible={ false }>
-					<p>
-						{ __(
-							'Conversion measurement has been set up. You can create a campaign later.',
-							'google-listings-and-ads'
-						) }
-					</p>
-				</Notice>
-			) }
-
 			{ ! hideAccountSwitch && (
 				<Section.Card.Footer>
 					<AppButton

js/src/components/google-ads-account-card/google-ads-account-card.js

@@ -1,3 +1,9 @@
+/**
+ * External dependencies
+ */
+import { Notice } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
 /**
  * Internal dependencies
  */
@@ -25,6 +31,17 @@
 	}
 
 	return (
-		<ConnectedGoogleAdsAccountCard googleAdsAccount={ googleAdsAccount } />
+		<ConnectedGoogleAdsAccountCard googleAdsAccount={ googleAdsAccount }>
+			{ googleAdsAccount.status === GOOGLE_ADS_ACCOUNT_STATUS.COMPLETE && (
+				<Notice status="success" isDismissible={ false }>
+					<p>
+						{ __(
+							'Conversion measurement has been set up. You can create a campaign later.',
+							'google-listings-and-ads'
+						) }
+					</p>
+				</Notice>
+			) }
+		</ConnectedGoogleAdsAccountCard>
 	);
 }