1 files changed, 20 insertions, 13 deletions
diff --git a/packages/web-util/src/forms/InputAmount.tsx b/packages/web-util/src/forms/InputAmount.tsx
index 7a8c08f76..647d2c823 100644
--- a/packages/web-util/src/forms/InputAmount.tsx
+++ b/packages/web-util/src/forms/InputAmount.tsx
@@ -3,34 +3,41 @@ import { VNode, h } from "preact";
 import { UIFormProps } from "./FormProvider.js";
 import { InputLine } from "./InputLine.js";
 import { useField } from "./useField.js";
+import { noHandlerPropsAndNoContextForField } from "./InputArray.js";
 
 export function InputAmount<T extends object, K extends keyof T>(
   props: { currency?: string } & UIFormProps<T, K>,
 ): VNode {
-  const { value } = useField<T, K>(props.name);
+  //FIXME: remove deprecated
+  const fieldCtx = useField<T, K>(props.name);
+  const { value } =
+    props.handler ?? fieldCtx ?? noHandlerPropsAndNoContextForField(props.name);
   const currency =
     !value || !(value as any).currency
       ? props.currency
       : (value as any).currency;
   return (
     <InputLine<T, K>
+      {...props}
       type="text"
       before={{
         type: "text",
         text: currency as TranslatedString,
       }}
-      converter={{
-        //@ts-ignore
-        fromStringUI: (v): AmountJson => {
-
-          return Amounts.parse(`${currency}:${v}`) ?? Amounts.zeroOfCurrency(currency);
-        },
-        //@ts-ignore
-        toStringUI: (v: AmountJson) => {
-          return v === undefined ? "" : Amounts.stringifyValue(v);
-        },
-      }}
-      {...props}
+      //@ts-ignore
+      converter={
+        props.converter ?? {
+          fromStringUI: (v): AmountJson => {
+            return (
+              Amounts.parse(`${currency}:${v}`) ??
+              Amounts.zeroOfCurrency(currency)
+            );
+          },
+          toStringUI: (v: AmountJson) => {
+            return v === undefined ? "" : Amounts.stringifyValue(v);
+          },
+        }
+      }
     />
   );
 }