1 files changed, 15 insertions, 12 deletions
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/orders/list/Table.tsx b/packages/merchant-backoffice-ui/src/paths/instance/orders/list/Table.tsx
index 3c927033b..608c9b20d 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/orders/list/Table.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/orders/list/Table.tsx
@@ -36,6 +36,7 @@ import { ConfirmModal } from "../../../../components/modal/index.js";
 import { useConfigContext } from "../../../../context/config.js";
 import { MerchantBackend, WithId } from "../../../../declaration.js";
 import { mergeRefunds } from "../../../../utils/amount.js";
+import { datetimeFormatForSettings, useSettings } from "../../../../hooks/useSettings.js";
 
 type Entity = MerchantBackend.Orders.OrderHistoryEntry & WithId;
 interface Props {
@@ -136,6 +137,7 @@ function Table({
   hasMoreBefore,
 }: TableProps): VNode {
   const { i18n } = useTranslationContext();
+  const [settings] = useSettings();
   return (
     <div class="table-container">
       {onLoadMoreBefore && (
@@ -173,9 +175,9 @@ function Table({
                   {i.timestamp.t_s === "never"
                     ? "never"
                     : format(
-                        new Date(i.timestamp.t_s * 1000),
-                        "yyyy/MM/dd HH:mm:ss",
-                      )}
+                      new Date(i.timestamp.t_s * 1000),
+                      datetimeFormatForSettings(settings),
+                    )}
                 </td>
                 <td
                   onClick={(): void => onSelect(i)}
@@ -260,6 +262,7 @@ export function RefundModal({
 }: RefundModalProps): VNode {
   type State = { mainReason?: string; description?: string; refund?: string };
   const [form, setValue] = useState<State>({});
+  const [settings] = useSettings();
   const { i18n } = useTranslationContext();
   // const [errors, setErrors] = useState<FormErrors<State>>({});
 
@@ -281,8 +284,8 @@ export function RefundModal({
   const totalRefundable = !orderPrice
     ? Amounts.zeroOfCurrency(totalRefunded.currency)
     : refunds.length
-    ? Amounts.sub(orderPrice, totalRefunded).amount
-    : orderPrice;
+      ? Amounts.sub(orderPrice, totalRefunded).amount
+      : orderPrice;
 
   const isRefundable = Amounts.isNonZero(totalRefundable);
   const duplicatedText = i18n.str`duplicated`;
@@ -296,10 +299,10 @@ export function RefundModal({
     refund: !form.refund
       ? i18n.str`required`
       : !Amounts.parse(form.refund)
-      ? i18n.str`invalid format`
-      : Amounts.cmp(totalRefundable, Amounts.parse(form.refund)!) === -1
-      ? i18n.str`this value exceed the refundable amount`
-      : undefined,
+        ? i18n.str`invalid format`
+        : Amounts.cmp(totalRefundable, Amounts.parse(form.refund)!) === -1
+          ? i18n.str`this value exceed the refundable amount`
+          : undefined,
   };
   const hasErrors = Object.keys(errors).some(
     (k) => (errors as any)[k] !== undefined,
@@ -361,9 +364,9 @@ export function RefundModal({
                           {r.timestamp.t_s === "never"
                             ? "never"
                             : format(
-                                new Date(r.timestamp.t_s * 1000),
-                                "yyyy-MM-dd HH:mm:ss",
-                              )}
+                              new Date(r.timestamp.t_s * 1000),
+                              datetimeFormatForSettings(settings),
+                            )}
                         </td>
                         <td>{r.amount}</td>
                         <td>{r.reason}</td>