1 files changed, 11 insertions, 20 deletions
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/orders/details/DetailPage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/orders/details/DetailPage.tsx
index cec00fe24..4aed0cc42 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/orders/details/DetailPage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/orders/details/DetailPage.tsx
@@ -160,6 +160,10 @@ function ClaimedPage({
   id: string;
   order: TalerMerchantApi.CheckPaymentClaimedResponse;
 }) {
+  const now = new Date();
+  const refundable =
+    order.contract_terms.refund_deadline.t_s !== "never" &&
+    now.getTime() < order.contract_terms.refund_deadline.t_s * 1000;
   const events: Event[] = [];
   if (order.contract_terms.timestamp.t_s !== "never") {
     events.push({
@@ -175,7 +179,7 @@ function ClaimedPage({
       type: "deadline",
     });
   }
-  if (order.contract_terms.refund_deadline.t_s !== "never") {
+  if (order.contract_terms.refund_deadline.t_s !== "never" && refundable) {
     events.push({
       when: new Date(order.contract_terms.refund_deadline.t_s * 1000),
       description: "refund deadline",
@@ -327,22 +331,13 @@ function PaidPage({
   order: TalerMerchantApi.CheckPaymentPaidResponse;
   onRefund: (id: string) => void;
 }) {
+  const now = new Date();
+  const refundable =
+    order.contract_terms.refund_deadline.t_s !== "never" &&
+    now.getTime() < order.contract_terms.refund_deadline.t_s * 1000;
+
   const events: Event[] = [];
-  // if (order.contract_terms.timestamp.t_s !== "never") {
-  //   events.push({
-  //     when: new Date(order.contract_terms.timestamp.t_s * 1000),
-  //     description: "order created",
-  //     type: "start",
-  //   });
-  // }
-  // if (order.contract_terms.pay_deadline.t_s !== "never") {
-  //   events.push({
-  //     when: new Date(order.contract_terms.pay_deadline.t_s * 1000),
-  //     description: "pay deadline",
-  //     type: "deadline",
-  //   });
-  // }
-  if (order.contract_terms.refund_deadline.t_s !== "never") {
+  if (order.contract_terms.refund_deadline.t_s !== "never" && refundable) {
     events.push({
       when: new Date(order.contract_terms.refund_deadline.t_s * 1000),
       description: "refund deadline",
@@ -430,7 +425,6 @@ function PaidPage({
     }
   }
 
-  const now = new Date();
   const nextEvent = events.find((e) => {
     return e.when.getTime() > now.getTime();
   });
@@ -442,9 +436,6 @@ function PaidPage({
     merchantBaseUrl: backendUrl.href,
     orderId: order.contract_terms.order_id,
   });
-  const refundable =
-    order.contract_terms.refund_deadline.t_s !== "never" &&
-    new Date().getTime() < order.contract_terms.refund_deadline.t_s * 1000;
   const { i18n } = useTranslationContext();
 
   const amount = Amounts.parseOrThrow(order.contract_terms.amount);