fix(mailchimp): selecting mailchimp segments with groups (#1600)

* fix(mailchimp): selected segment when segment contains groups * fix: wrong order of conditions
Automattic · Aug 19, 2024 · a698aaa · a698aaa
1 parent 776f316
commit a698aaa
Showing 1 changed file with 7 additions and 5 deletions.
diff --git 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;
 };