1 files changed, 7 insertions, 5 deletions
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/orders/list/ListPage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/orders/list/ListPage.tsx
index 7b88985dc..12762c3b3 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/orders/list/ListPage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/orders/list/ListPage.tsx
@@ -19,7 +19,7 @@
  * @author Sebastian Javier Marchano (sebasjm)
  */
 
-import { TalerMerchantApi } from "@gnu-taler/taler-util";
+import { AbsoluteTime, TalerMerchantApi } from "@gnu-taler/taler-util";
 import { useTranslationContext } from "@gnu-taler/web-util/browser";
 import { format } from "date-fns";
 import { Fragment, VNode, h } from "preact";
@@ -43,8 +43,8 @@ export interface ListPageProps {
   isNotWiredActive: string;
   isWiredActive: string;
 
-  jumpToDate?: Date;
-  onSelectDate: (date?: Date) => void;
+  jumpToDate?: AbsoluteTime;
+  onSelectDate: (date?: AbsoluteTime) => void;
 
   orders: (TalerMerchantApi.OrderHistoryEntry & WithId)[];
   onLoadMoreBefore?: () => void;
@@ -177,7 +177,7 @@ export function ListPage({
                     class="input"
                     type="text"
                     readonly
-                    value={!jumpToDate ? "" : format(jumpToDate, dateFormatForSettings(settings))}
+                    value={!jumpToDate || jumpToDate.t_ms === "never" ? "" : format(jumpToDate.t_ms, dateFormatForSettings(settings))}
                     placeholder={i18n.str`date (${dateFormatForSettings(settings)})`}
                     onClick={() => {
                       setPickDate(true);
@@ -207,7 +207,9 @@ export function ListPage({
       <DatePicker
         opened={pickDate}
         closeFunction={() => setPickDate(false)}
-        dateReceiver={onSelectDate}
+        dateReceiver={(d) => {
+          onSelectDate(AbsoluteTime.fromMilliseconds(d.getTime()))
+        }}
       />
 
       <CardTable