Add condition to not render the claim components if there's no connec…

…ted account.
woocommerce · Nov 5, 2024 · dacbd04 · dacbd04
1 parent 66de193
commit dacbd04
Showing 1 changed file with 44 additions and 41 deletions.
diff --git a/js/src/components/google-mc-account-card/connect-mc/index.js b/js/src/components/google-mc-account-card/connect-mc/index.js
@@ -60,49 +60,52 @@ const ConnectMC = ( { createAccount, resultCreateAccount, className } ) => {
 		}
 	}, [ googleMCAccount, isGoogleMCReady ] );
 
-	if ( resultConnectMC.response?.status === 409 ) {
-		return (
-			<SwitchUrlCard
-				id={ resultConnectMC.error.id }
-				message={ resultConnectMC.error.message }
-				claimedUrl={ resultConnectMC.error.claimed_url }
-				newUrl={ resultConnectMC.error.new_url }
-				onSelectAnotherAccount={ resultConnectMC.reset }
-			/>
-		);
-	}
+	if ( ! isGoogleMCReady ) {
+		if ( resultConnectMC.response?.status === 409 ) {
+			return (
+				<SwitchUrlCard
+					id={ resultConnectMC.error.id }
+					message={ resultConnectMC.error.message }
+					claimedUrl={ resultConnectMC.error.claimed_url }
+					newUrl={ resultConnectMC.error.new_url }
+					onSelectAnotherAccount={ resultConnectMC.reset }
+				/>
+			);
+		}
 
-	if (
-		resultConnectMC.response?.status === 403 ||
-		resultCreateAccount.response?.status === 403
-	) {
-		return (
-			<ReclaimUrlCard
-				id={
-					resultConnectMC.error?.id || resultCreateAccount.error?.id
-				}
-				websiteUrl={
-					resultConnectMC.error?.website_url ||
-					resultCreateAccount.error?.website_url
-				}
-				onSwitchAccount={ () => {
-					resultConnectMC.reset();
-					resultCreateAccount.reset();
-				} }
-			/>
-		);
-	}
+		if (
+			resultConnectMC.response?.status === 403 ||
+			resultCreateAccount.response?.status === 403
+		) {
+			return (
+				<ReclaimUrlCard
+					id={
+						resultConnectMC.error?.id ||
+						resultCreateAccount.error?.id
+					}
+					websiteUrl={
+						resultConnectMC.error?.website_url ||
+						resultCreateAccount.error?.website_url
+					}
+					onSwitchAccount={ () => {
+						resultConnectMC.reset();
+						resultCreateAccount.reset();
+					} }
+				/>
+			);
+		}
 
-	if (
-		resultCreateAccount.loading ||
-		resultCreateAccount.response?.status === 503
-	) {
-		return (
-			<CreatingCard
-				retryAfter={ resultCreateAccount.error?.retry_after }
-				onRetry={ createAccount }
-			/>
-		);
+		if (
+			resultCreateAccount.loading ||
+			resultCreateAccount.response?.status === 503
+		) {
+			return (
+				<CreatingCard
+					retryAfter={ resultCreateAccount.error?.retry_after }
+					onRetry={ createAccount }
+				/>
+			);
+		}
 	}
 
 	const getIndicator = () => {