From 33ced0d9a13b77cc6936e716d1b9c8484f61dc8f Mon Sep 17 00:00:00 2001
From: Pavel Dohnal <pavel@mailpoet.com>
Date: Tue, 18 May 2021 10:15:43 +0200
Subject: [PATCH] Fix checkbox field

[MAILPOET-3220]
---
 .../dynamic/dynamic_segments_filters/custom_fields/checkbox.tsx | 2 +-
 lib/Segments/DynamicSegments/FilterDataMapper.php               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/checkbox.tsx b/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/checkbox.tsx
index 2c31e82471..8ab758071f 100644
--- a/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/checkbox.tsx
+++ b/assets/js/src/segments/dynamic/dynamic_segments_filters/custom_fields/checkbox.tsx
@@ -38,7 +38,7 @@ export const Checkbox: React.FunctionComponent<Props> = ({ onChange, item }) =>
       <div className="mailpoet-gap" />
       <Select
         key="select"
-        value={item.operator}
+        value={item.value}
         onChange={compose([
           onChange,
           assign(item),
diff --git a/lib/Segments/DynamicSegments/FilterDataMapper.php b/lib/Segments/DynamicSegments/FilterDataMapper.php
index eaee67d7ff..50f101c8f8 100644
--- a/lib/Segments/DynamicSegments/FilterDataMapper.php
+++ b/lib/Segments/DynamicSegments/FilterDataMapper.php
@@ -57,7 +57,7 @@ class FilterDataMapper {
     if ($data['action'] === MailPoetCustomFields::TYPE) {
       if (empty($data['custom_field_id'])) throw new InvalidFilterException('Missing custom field id', InvalidFilterException::MISSING_VALUE);
       if (empty($data['custom_field_type'])) throw new InvalidFilterException('Missing custom field type', InvalidFilterException::MISSING_VALUE);
-      if (empty($data['value'])) throw new InvalidFilterException('Missing value', InvalidFilterException::MISSING_VALUE);
+      if (!isset($data['value'])) throw new InvalidFilterException('Missing value', InvalidFilterException::MISSING_VALUE);
       $filterData = [
         'segmentType' => DynamicSegmentFilterData::TYPE_USER_ROLE,
         'action' => $data['action'],