From a698aaa2940a425416324fd7f0266eedc22dc2b1 Mon Sep 17 00:00:00 2001
From: Derrick Koo <dkoo@users.noreply.github.com>
Date: Mon, 19 Aug 2024 11:59:22 -0600
Subject: [PATCH] fix(mailchimp): selecting mailchimp segments with groups
 (#1600)

* fix(mailchimp): selected segment when segment contains groups

* fix: wrong order of conditions
---
 src/service-providers/mailchimp/ProviderSidebar.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/service-providers/mailchimp/ProviderSidebar.js b/src/service-providers/mailchimp/ProviderSidebar.js
index f97ff1f31..0768fc711 100644
--- a/src/service-providers/mailchimp/ProviderSidebar.js
+++ b/src/service-providers/mailchimp/ProviderSidebar.js
@@ -65,13 +65,15 @@ const getSubAudienceValue = newsletterData => {
 	const targetId =
 		( Array.isArray( targetIdRawValue ) ? targetIdRawValue[ 0 ] : targetIdRawValue ).toString() ||
 		'';
-	const targetField = recipients?.segment_opts?.conditions?.length
-		? recipients?.segment_opts?.conditions[ 0 ]?.field
-		: '';
-	if ( ! targetField || ! targetId ) {
+	const targetField =
+		! recipients?.segment_opts?.saved_segment_id && recipients?.segment_opts?.conditions?.length
+			? recipients?.segment_opts?.conditions[ 0 ]?.field
+			: '';
+	if ( ! targetField && ! targetId ) {
 		return false;
 	}
-	return 'Interests' === recipients?.segment_opts?.conditions[ 0 ]?.condition_type
+	return ! recipients?.segment_opts?.saved_segment_id &&
+		'Interests' === recipients?.segment_opts?.conditions[ 0 ]?.condition_type
 		? `${ targetField || '' }:${ targetId }`
 		: targetId;
 };