1 files changed, 8 insertions, 3 deletions
diff --git a/packages/merchant-backoffice-ui/src/components/form/InputDate.tsx b/packages/merchant-backoffice-ui/src/components/form/InputDate.tsx
index 1f41c3564..a398629dc 100644
--- a/packages/merchant-backoffice-ui/src/components/form/InputDate.tsx
+++ b/packages/merchant-backoffice-ui/src/components/form/InputDate.tsx
@@ -20,16 +20,18 @@
  */
 import { useTranslationContext } from "@gnu-taler/web-util/browser";
 import { format } from "date-fns";
-import { h, VNode } from "preact";
+import { ComponentChildren, h, VNode } from "preact";
 import { useState } from "preact/hooks";
 import { DatePicker } from "../picker/DatePicker.js";
 import { InputProps, useField } from "./useField.js";
+import { dateFormatForSettings, useSettings } from "../../hooks/useSettings.js";
 
 export interface Props<T> extends InputProps<T> {
   readonly?: boolean;
   expand?: boolean;
   //FIXME: create separated components InputDate and InputTimestamp
   withTimestampSupport?: boolean;
+  side?: ComponentChildren;
 }
 
 export function InputDate<T>({
@@ -41,9 +43,11 @@ export function InputDate<T>({
   tooltip,
   expand,
   withTimestampSupport,
+  side,
 }: Props<keyof T>): VNode {
   const [opened, setOpened] = useState(false);
   const { i18n } = useTranslationContext();
+  const [settings] = useSettings()
 
   const { error, required, value, onChange } = useField<T>(name);
 
@@ -51,14 +55,14 @@ export function InputDate<T>({
   if (!value) {
     strValue = withTimestampSupport ? "unknown" : "";
   } else if (value instanceof Date) {
-    strValue = format(value, "yyyy/MM/dd");
+    strValue = format(value, dateFormatForSettings(settings));
   } else if (value.t_s) {
     strValue =
       value.t_s === "never"
         ? withTimestampSupport
           ? "never"
           : ""
-        : format(new Date(value.t_s * 1000), "yyyy/MM/dd");
+        : format(new Date(value.t_s * 1000), dateFormatForSettings(settings));
   }
 
   return (
@@ -142,6 +146,7 @@ export function InputDate<T>({
             </button>
           </span>
         )}
+        {side}
       </div>
       <DatePicker
         opened={opened}