diff --git a/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber.tsx b/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber.tsx index 2533c562d1..0e25e813f1 100644 --- a/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber.tsx +++ b/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber.tsx @@ -29,7 +29,7 @@ export function validateSubscriber(formItems: WordpressRoleFormItem): boolean { || formItems.operator === SubscribedDateOperator.NOT_IN_THE_LAST ) { const re = new RegExp(/^\d+$/); - return re.test(formItems.value); + return re.test(formItems.value) && (Number(formItems.value) > 0); } return false; } diff --git a/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_subscribed_date.tsx b/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_subscribed_date.tsx index 975e4ecbd4..81e4dcfdb3 100644 --- a/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_subscribed_date.tsx +++ b/assets/js/src/segments/dynamic/dynamic_segments_filters/subscriber_subscribed_date.tsx @@ -57,9 +57,9 @@ export const SubscribedDateFields: React.FunctionComponent = ({ onChange, item.operator === SubscribedDateOperator.IN_THE_LAST || item.operator === SubscribedDateOperator.NOT_IN_THE_LAST ) - && ((typeof item.value !== 'string') || !new RegExp(/^\d+$/).exec(item.value)) + && ((typeof item.value === 'string') && !new RegExp(/^\d*$/).exec(item.value)) ) { - onChange(assign(item, { value: '1' })); + onChange(assign(item, { value: '' })); } }, [onChange, item]); @@ -103,7 +103,7 @@ export const SubscribedDateFields: React.FunctionComponent = ({ onChange, value={item.value} onChange={(e): void => onChange(assign(item, { value: e.target.value }))} min="1" - placeholder={MailPoet.I18n.t('wooNumberOfOrdersDaysPlaceholder')} + placeholder={MailPoet.I18n.t('daysPlaceholder')} /> )}