Prevent complete re rendering of the card.

woocommerce · Oct 30, 2024 · 3e4249c · 3e4249c
1 parent db10842
commit 3e4249c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/js/src/components/google-combo-account-card/connect-ads/connect-ads-body.js b/js/src/components/google-combo-account-card/connect-ads/connect-ads-body.js
@@ -30,6 +30,26 @@ const ConnectAdsBody = ( {
 	setValue,
 	accountID,
 } ) => {
+	const getAction = () => {
+		if ( isLoading ) {
+			return (
+				<LoadingLabel
+					text={ __( 'Connecting…', 'google-listings-and-ads' ) }
+				/>
+			);
+		}
+
+		if ( isConnected ) {
+			return <ConnectedIconLabel />;
+		}
+
+		if ( isConnected === null ) {
+			return <ConnectButton loading />;
+		}
+
+		return <ConnectButton accountID={ accountID } onClick={ onClick } />;
+	};
+
 	return (
 		<ContentButtonLayout>
 			<AdsAccountSelectControl
@@ -38,22 +58,8 @@ const ConnectAdsBody = ( {
 				autoSelectFirstOption={ true }
 				nonInteractive={ isConnected }
 			/>
-			{ isLoading ? (
-				<LoadingLabel
-					text={ __( 'Connecting…', 'google-listings-and-ads' ) }
-				/>
-			) : (
-				<>
-					{ isConnected ? (
-						<ConnectedIconLabel />
-					) : (
-						<ConnectButton
-							accountID={ accountID }
-							onClick={ onClick }
-						/>
-					) }
-				</>
-			) }
+
+			{ getAction() }
 		</ContentButtonLayout>
 	);
 };

diff --git a/js/src/components/google-combo-account-card/connect-ads/connect-ads.js b/js/src/components/google-combo-account-card/connect-ads/connect-ads.js
@@ -106,12 +106,7 @@ const ConnectAds = ( { isEditing } ) => {
 		}
 	};
 
-	// If the accounts are still being fetched, we don't want to show the card.
-	if (
-		! hasFinishedResolutionForExistingAdsAccount ||
-		! hasFinishedResolutionForCurrentAccount ||
-		! accounts?.length
-	) {
+	if ( ! accounts?.length ) {
 		return null;
 	}