1 files changed, 14 insertions, 18 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 9f80719a1..408bc0c0a 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
@@ -1,6 +1,6 @@
 /*
  This file is part of GNU Taler
- (C) 2021-2023 Taler Systems S.A.
+ (C) 2021-2024 Taler Systems S.A.
 
  GNU Taler is free software; you can redistribute it and/or modify it under the
  terms of the GNU General Public License as published by the Free Software
@@ -19,14 +19,14 @@
  * @author Sebastian Javier Marchano (sebasjm)
  */
 
+import { AbsoluteTime, TalerMerchantApi } from "@gnu-taler/taler-util";
 import { useTranslationContext } from "@gnu-taler/web-util/browser";
 import { format } from "date-fns";
-import { h, VNode, Fragment } from "preact";
+import { Fragment, VNode, h } from "preact";
 import { useState } from "preact/hooks";
 import { DatePicker } from "../../../../components/picker/DatePicker.js";
-import { MerchantBackend, WithId } from "../../../../declaration.js";
+import { dateFormatForSettings, usePreference } from "../../../../hooks/preference.js";
 import { CardTable } from "./Table.js";
-import { dateFormatForSettings, useSettings } from "../../../../hooks/useSettings.js";
 
 export interface ListPageProps {
   onShowAll: () => void;
@@ -43,23 +43,19 @@ export interface ListPageProps {
   isNotWiredActive: string;
   isWiredActive: string;
 
-  jumpToDate?: Date;
-  onSelectDate: (date?: Date) => void;
+  jumpToDate?: AbsoluteTime;
+  onSelectDate: (date?: AbsoluteTime) => void;
 
-  orders: (MerchantBackend.Orders.OrderHistoryEntry & WithId)[];
+  orders: (TalerMerchantApi.OrderHistoryEntry & WithId)[];
   onLoadMoreBefore?: () => void;
-  hasMoreBefore?: boolean;
-  hasMoreAfter?: boolean;
   onLoadMoreAfter?: () => void;
 
-  onSelectOrder: (o: MerchantBackend.Orders.OrderHistoryEntry & WithId) => void;
-  onRefundOrder: (o: MerchantBackend.Orders.OrderHistoryEntry & WithId) => void;
+  onSelectOrder: (o: TalerMerchantApi.OrderHistoryEntry & WithId) => void;
+  onRefundOrder: (o: TalerMerchantApi.OrderHistoryEntry & WithId) => void;
   onCreate: () => void;
 }
 
 export function ListPage({
-  hasMoreAfter,
-  hasMoreBefore,
   onLoadMoreAfter,
   onLoadMoreBefore,
   orders,
@@ -85,7 +81,7 @@ export function ListPage({
   const { i18n } = useTranslationContext();
   const dateTooltip = i18n.str`select date to show nearby orders`;
   const [pickDate, setPickDate] = useState(false);
-  const [settings] = useSettings();
+  const [settings] = usePreference();
 
   return (
     <Fragment>
@@ -177,7 +173,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 +203,9 @@ export function ListPage({
       <DatePicker
         opened={pickDate}
         closeFunction={() => setPickDate(false)}
-        dateReceiver={onSelectDate}
+        dateReceiver={(d) => {
+          onSelectDate(AbsoluteTime.fromMilliseconds(d.getTime()))
+        }}
       />
 
       <CardTable
@@ -216,8 +214,6 @@ export function ListPage({
         onCopyURL={onCopyURL}
         onSelect={onSelectOrder}
         onRefund={onRefundOrder}
-        hasMoreAfter={hasMoreAfter}
-        hasMoreBefore={hasMoreBefore}
         onLoadMoreAfter={onLoadMoreAfter}
         onLoadMoreBefore={onLoadMoreBefore}
       />