ACP2E-4239: Date Filter not working according to store timezone on Credit Memos grid

Author: aplapana

app/code/Magento/Ui/Component/Form/Element/DataType/Date.php

@@ -130,7 +130,7 @@ public function convertDateWithTimezone(
         bool $useStoreTimeZone = true
     ): ?\DateTime {
         if (!$useStoreTimeZone) {
-            $this->convertDate($date, $hour, $minute, $second, $setUtcTimeZone);
+            return $this->convertDate($date, $hour, $minute, $second, $setUtcTimeZone);
         }
 
         try {

app/code/Magento/Ui/Test/Unit/Component/Filters/Type/DateTest.php

@@ -16,6 +16,7 @@
 use Magento\Ui\Component\Filters\FilterModifier;
 use Magento\Ui\Component\Filters\Type\Date;
 use Magento\Ui\Component\Form\Element\DataType\Date as FormDate;
+use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -210,9 +211,10 @@ public static function getPrepareDataProvider(): array
      * @param bool $showsTime
      * @param array $filterData
      * @param array $expectedCondition
-     * @param MockObject $uiComponent
+     * @param FormDate $uiComponent
      *
      * @return void
+     * @throws Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function processFilters(
@@ -244,8 +246,8 @@ private function processFilters(
                 $uiComponent->method('convertDateWithTimezone')
                     ->willReturnMap(
                         [
-                            [$filterData[$name]['from'], 0, 0, 0, true, $from],
-                            [$filterData[$name]['to'], 23, 59, 59, true, $to],
+                            [$filterData[$name]['from'], 0, 0, 0, true, true, $from],
+                            [$filterData[$name]['to'], 23, 59, 59, true, true, $to],
                         ]
                     );
             }