import from web utils

16 files changed, 21 insertions, 37 deletions

diff --git a/packages/aml-backoffice-ui/src/forms/902_11e.ts b/packages/aml-backoffice-ui/src/forms/902_11e.ts
index b2943a1d4..932971ef2 100644
--- a/packages/aml-backoffice-ui/src/forms/902_11e.ts
+++ b/packages/aml-backoffice-ui/src/forms/902_11e.ts
@@ -1,8 +1,7 @@
 import { TranslatedString } from "@gnu-taler/taler-util";
-import { FormState } from "../handlers/FormProvider.js";
 import { BaseForm } from "../pages/AntiMoneyLaunderingForm.js";
 import { resolutionSection } from "./simplest.js";
-import { FlexibleForm } from "../handlers/forms.js";
+import { FlexibleForm, FormState } from "@gnu-taler/web-util/browser";
 
 export const v1 = (current: BaseForm): FlexibleForm<Form902_11.Form> => ({
   design: [
diff --git a/packages/aml-backoffice-ui/src/forms/902_12e.ts b/packages/aml-backoffice-ui/src/forms/902_12e.ts
index 815d75c49..7adeb6988 100644
--- a/packages/aml-backoffice-ui/src/forms/902_12e.ts
+++ b/packages/aml-backoffice-ui/src/forms/902_12e.ts
@@ -1,8 +1,7 @@
 import { AbsoluteTime, TranslatedString } from "@gnu-taler/taler-util";
-import { FormState } from "../handlers/FormProvider.js";
+import { FlexibleForm, FormState } from "@gnu-taler/web-util/browser";
 import { BaseForm } from "../pages/AntiMoneyLaunderingForm.js";
 import { resolutionSection } from "./simplest.js";
-import { FlexibleForm } from "../handlers/forms.js";
 
 export const v1 = (current: BaseForm): FlexibleForm<Form902_12.Form> => ({
   design: [
diff --git a/packages/aml-backoffice-ui/src/forms/902_13e.ts b/packages/aml-backoffice-ui/src/forms/902_13e.ts
index 1eccd4b51..83ce88624 100644
--- a/packages/aml-backoffice-ui/src/forms/902_13e.ts
+++ b/packages/aml-backoffice-ui/src/forms/902_13e.ts
@@ -1,8 +1,7 @@
 import { AbsoluteTime, TranslatedString } from "@gnu-taler/taler-util";
-import { FormState } from "../handlers/FormProvider.js";
+import { FlexibleForm, FormState } from "@gnu-taler/web-util/browser";
 import { BaseForm, } from "../pages/AntiMoneyLaunderingForm.js";
 import { resolutionSection } from "./simplest.js";
-import { FlexibleForm } from "../handlers/forms.js";
 
 export const v1 = (current: BaseForm): FlexibleForm<Form902_13.Form> => ({
   design: [
diff --git a/packages/aml-backoffice-ui/src/forms/902_15e.ts b/packages/aml-backoffice-ui/src/forms/902_15e.ts
index 92ec03716..88bf769ef 100644
--- a/packages/aml-backoffice-ui/src/forms/902_15e.ts
+++ b/packages/aml-backoffice-ui/src/forms/902_15e.ts
@@ -1,7 +1,7 @@
 import { AbsoluteTime, TranslatedString } from "@gnu-taler/taler-util";
+import { FlexibleForm } from "@gnu-taler/web-util/browser";
 import { BaseForm } from "../pages/AntiMoneyLaunderingForm.js";
 import { resolutionSection } from "./simplest.js";
-import { FlexibleForm } from "../handlers/forms.js";
 
 export const v1 = (current: BaseForm): FlexibleForm<Form902_15.Form> => ({
   design: [
diff --git a/packages/aml-backoffice-ui/src/forms/902_1e.ts b/packages/aml-backoffice-ui/src/forms/902_1e.ts
index 806833cd9..f146cde63 100644
--- a/packages/aml-backoffice-ui/src/forms/902_1e.ts
+++ b/packages/aml-backoffice-ui/src/forms/902_1e.ts
@@ -1,9 +1,8 @@
 import { AbsoluteTime, TranslatedString } from "@gnu-taler/taler-util";
-import { FormState } from "../handlers/FormProvider.js";
+import { FlexibleForm, FormState } from "@gnu-taler/web-util/browser";
 import { BaseForm } from "../pages/AntiMoneyLaunderingForm.js";
 import { languageList } from "./index.js";
 import { resolutionSection } from "./simplest.js";
-import { FlexibleForm } from "../handlers/forms.js";
 
 export const v1 = (current: BaseForm): FlexibleForm<Form902_1.Form> => ({
   design: [
diff --git a/packages/aml-backoffice-ui/src/forms/902_4e.ts b/packages/aml-backoffice-ui/src/forms/902_4e.ts
index 14d2d1e1c..6c6e55886 100644
--- a/packages/aml-backoffice-ui/src/forms/902_4e.ts
+++ b/packages/aml-backoffice-ui/src/forms/902_4e.ts
@@ -1,7 +1,6 @@
 import { AbsoluteTime, TranslatedString } from "@gnu-taler/taler-util";
+import { FlexibleForm, FormState } from "@gnu-taler/web-util/browser";
 import { h as create } from "preact";
-import { FormState } from "../handlers/FormProvider.js";
-import { FlexibleForm } from "../handlers/forms.js";
 import { BaseForm } from "../pages/AntiMoneyLaunderingForm.js";
 import { ArrowRightIcon, ChevronRightIcon } from "../pages/Cases.js";
 import { resolutionSection } from "./simplest.js";
diff --git a/packages/aml-backoffice-ui/src/forms/902_5e.ts b/packages/aml-backoffice-ui/src/forms/902_5e.ts
index fe545481f..8eafb506e 100644
--- a/packages/aml-backoffice-ui/src/forms/902_5e.ts
+++ b/packages/aml-backoffice-ui/src/forms/902_5e.ts
@@ -1,9 +1,8 @@
 import { TranslatedString } from "@gnu-taler/taler-util";
-import { FormState } from "../handlers/FormProvider.js";
+import { FlexibleForm, FormState } from "@gnu-taler/web-util/browser";
 import { BaseForm } from "../pages/AntiMoneyLaunderingForm.js";
 import { currencyList } from "./index.js";
 import { resolutionSection } from "./simplest.js";
-import { FlexibleForm } from "../handlers/forms.js";
 
 export const v1 = (current: BaseForm): FlexibleForm<Form902_5.Form> => ({
   design: [
diff --git a/packages/aml-backoffice-ui/src/forms/902_9e.ts b/packages/aml-backoffice-ui/src/forms/902_9e.ts
index cdbd1a84c..323a5a057 100644
--- a/packages/aml-backoffice-ui/src/forms/902_9e.ts
+++ b/packages/aml-backoffice-ui/src/forms/902_9e.ts
@@ -1,8 +1,7 @@
 import { AbsoluteTime, TranslatedString } from "@gnu-taler/taler-util";
-import { FormState } from "../handlers/FormProvider.js";
+import { FlexibleForm, FormState } from "@gnu-taler/web-util/browser";
 import { BaseForm } from "../pages/AntiMoneyLaunderingForm.js";
 import { resolutionSection } from "./simplest.js";
-import { FlexibleForm } from "../handlers/forms.js";
 
 export const v1 = (current: BaseForm): FlexibleForm<Form902_9.Form> => ({
   design: [
diff --git a/packages/aml-backoffice-ui/src/forms/simplest.ts b/packages/aml-backoffice-ui/src/forms/simplest.ts
index 5a8d370c9..99d109da9 100644
--- a/packages/aml-backoffice-ui/src/forms/simplest.ts
+++ b/packages/aml-backoffice-ui/src/forms/simplest.ts
@@ -4,12 +4,11 @@ import {
   Amounts,
   TranslatedString,
 } from "@gnu-taler/taler-util";
-import { FormState } from "../handlers/FormProvider.js";
-import { DoubleColumnFormSection, FlexibleForm } from "../handlers/forms.js";
 import { BaseForm } from "../pages/AntiMoneyLaunderingForm.js";
 
 import { AmlExchangeBackend } from "../types.js";
 import { amlStateConverter } from "../pages/ShowConsolidated.js";
+import { DoubleColumnFormSection, FlexibleForm, FormState } from "@gnu-taler/web-util/browser";
 
 export const v1 = (current: BaseForm): FlexibleForm<Simplest.Form> => ({
   design: [
diff --git a/packages/aml-backoffice-ui/src/pages/AntiMoneyLaunderingForm.tsx b/packages/aml-backoffice-ui/src/pages/AntiMoneyLaunderingForm.tsx
index 020727fca..ede8c9955 100644
--- a/packages/aml-backoffice-ui/src/pages/AntiMoneyLaunderingForm.tsx
+++ b/packages/aml-backoffice-ui/src/pages/AntiMoneyLaunderingForm.tsx
@@ -1,7 +1,5 @@
 import { AbsoluteTime, AmountJson, Amounts, Codec, OperationResult, buildCodecForObject, codecForNumber, codecForString, codecOptional } from "@gnu-taler/taler-util";
-import { useTranslationContext } from "@gnu-taler/web-util/browser";
 import { h } from "preact";
-import { NiceForm } from "../handlers/NiceForm.js";
 import { v1 as form_902_11e_v1 } from "../forms/902_11e.js";
 import { v1 as form_902_12e_v1 } from "../forms/902_12e.js";
 import { v1 as form_902_13e_v1 } from "../forms/902_13e.js";
@@ -14,7 +12,7 @@ import { v1 as simplest } from "../forms/simplest.js";
 import { Pages } from "../pages.js";
 import { AmlExchangeBackend } from "../types.js";
 import { useExchangeApiContext } from "../context/config.js";
-import { FlexibleForm } from "../handlers/forms.js";
+import { DefaultForm, FlexibleForm, useTranslationContext } from "@gnu-taler/web-util/browser";
 
 export function AntiMoneyLaunderingForm({ account, formId, onSubmit }: { account: string, formId: string, onSubmit: (justification: Justification, state: AmlExchangeBackend.AmlState, threshold: AmountJson) => Promise<void>; }) {
   const { i18n } = useTranslationContext()
@@ -31,7 +29,7 @@ export function AntiMoneyLaunderingForm({ account, formId, onSubmit }: { account
     threshold: Amounts.zeroOfCurrency(config.currency),
   };
   return (
-    <NiceForm
+    <DefaultForm
       initial={initial}
       form={theForm.impl(initial)}
       onUpdate={() => { }}
@@ -64,7 +62,7 @@ export function AntiMoneyLaunderingForm({ account, formId, onSubmit }: { account
           <i18n.Translate>Confirm</i18n.Translate>
         </button>
       </div>
-    </NiceForm>
+    </DefaultForm>
   );
 }
 
diff --git a/packages/aml-backoffice-ui/src/pages/CaseDetails.tsx b/packages/aml-backoffice-ui/src/pages/CaseDetails.tsx
index 40ae282dd..0a2680b1b 100644
--- a/packages/aml-backoffice-ui/src/pages/CaseDetails.tsx
+++ b/packages/aml-backoffice-ui/src/pages/CaseDetails.tsx
@@ -6,11 +6,10 @@ import {
   TranslatedString,
   assertUnreachable
 } from "@gnu-taler/taler-util";
-import { ErrorLoading, Loading, useTranslationContext } from "@gnu-taler/web-util/browser";
+import { DefaultForm, ErrorLoading, Loading, useTranslationContext } from "@gnu-taler/web-util/browser";
 import { format } from "date-fns";
 import { Fragment, VNode, h } from "preact";
 import { useState } from "preact/hooks";
-import { NiceForm } from "../handlers/NiceForm.js";
 import { useCaseDetails } from "../hooks/useCaseDetails.js";
 import { Pages } from "../pages.js";
 import { AmlExchangeBackend } from "../types.js";
@@ -134,7 +133,7 @@ export function CaseDetails({ account }: { account: string }) {
   const events = getEventsFromAmlHistory(aml_history, kyc_attributes);
 
   if (showForm !== undefined) {
-    return <NiceForm
+    return <DefaultForm
       readOnly={true}
       initial={showForm.justification.value}
       form={showForm.metadata.impl(showForm.justification.value)}
@@ -150,7 +149,7 @@ export function CaseDetails({ account }: { account: string }) {
         </button>
       </div>
 
-    </NiceForm>
+    </DefaultForm>
   }
   return (
     <div>
diff --git a/packages/aml-backoffice-ui/src/pages/Cases.tsx b/packages/aml-backoffice-ui/src/pages/Cases.tsx
index 96d1d634f..3d3d7b49b 100644
--- a/packages/aml-backoffice-ui/src/pages/Cases.tsx
+++ b/packages/aml-backoffice-ui/src/pages/Cases.tsx
@@ -1,8 +1,7 @@
 import { TalerError, TalerExchangeApi, TranslatedString, assertUnreachable } from "@gnu-taler/taler-util";
-import { ErrorLoading, Loading, useTranslationContext } from "@gnu-taler/web-util/browser";
+import { ErrorLoading, Loading, createNewForm, useTranslationContext } from "@gnu-taler/web-util/browser";
 import { VNode, h } from "preact";
 import { useState } from "preact/hooks";
-import { createNewForm } from "../handlers/forms.js";
 import { useCases } from "../hooks/useCases.js";
 import { Pages } from "../pages.js";
 import { AmlExchangeBackend } from "../types.js";
diff --git a/packages/aml-backoffice-ui/src/pages/CreateAccount.tsx b/packages/aml-backoffice-ui/src/pages/CreateAccount.tsx
index 9b8c3c046..cd4f2d923 100644
--- a/packages/aml-backoffice-ui/src/pages/CreateAccount.tsx
+++ b/packages/aml-backoffice-ui/src/pages/CreateAccount.tsx
@@ -1,10 +1,10 @@
 import { TranslatedString } from "@gnu-taler/taler-util";
 import {
+  createNewForm,
   notifyError,
   useTranslationContext,
 } from "@gnu-taler/web-util/browser";
 import { VNode, h } from "preact";
-import { createNewForm } from "../handlers/forms.js";
 import { useSettings } from "../hooks/useSettings.js";
 
 export function CreateAccount({
diff --git a/packages/aml-backoffice-ui/src/pages/ShowConsolidated.tsx b/packages/aml-backoffice-ui/src/pages/ShowConsolidated.tsx
index ce37fcf14..f59f8d41f 100644
--- a/packages/aml-backoffice-ui/src/pages/ShowConsolidated.tsx
+++ b/packages/aml-backoffice-ui/src/pages/ShowConsolidated.tsx
@@ -1,11 +1,9 @@
 import { AbsoluteTime, AmountJson, TranslatedString } from "@gnu-taler/taler-util";
 import { format } from "date-fns";
 import { Fragment, VNode, h } from "preact";
-import { NiceForm } from "../handlers/NiceForm.js";
-import { FlexibleForm } from "../handlers/forms.js";
-import { UIFormField } from "../handlers/forms.js";
 import { AmlExchangeBackend } from "../types.js";
 import { AmlEvent } from "./CaseDetails.js";
+import { DefaultForm, FlexibleForm, UIFormField } from "@gnu-taler/web-util/browser";
 
 export function ShowConsolidated({
   history,
@@ -95,7 +93,7 @@ export function ShowConsolidated({
           ? ""
           : `after ${format(until.t_ms, "dd MMMM yyyy")}`}
       </h1>
-      <NiceForm
+      <DefaultForm
         key={`${String(Date.now())}`}
         form={form}
         initial={cons}
diff --git a/packages/aml-backoffice-ui/src/pages/UnlockAccount.tsx b/packages/aml-backoffice-ui/src/pages/UnlockAccount.tsx
index ba5aa7b1f..46563f702 100644
--- a/packages/aml-backoffice-ui/src/pages/UnlockAccount.tsx
+++ b/packages/aml-backoffice-ui/src/pages/UnlockAccount.tsx
@@ -1,7 +1,6 @@
 import { TranslatedString, UnwrapKeyError } from "@gnu-taler/taler-util";
-import { notifyError, notifyInfo, useTranslationContext } from "@gnu-taler/web-util/browser";
+import { createNewForm, notifyError, notifyInfo, useTranslationContext } from "@gnu-taler/web-util/browser";
 import { VNode, h } from "preact";
-import { createNewForm } from "../handlers/forms.js";
 
 export function UnlockAccount({
   onAccountUnlocked,
diff --git a/packages/aml-backoffice-ui/src/stories.tsx b/packages/aml-backoffice-ui/src/stories.tsx
index 1352acc37..1aa6a44ac 100644
--- a/packages/aml-backoffice-ui/src/stories.tsx
+++ b/packages/aml-backoffice-ui/src/stories.tsx
@@ -21,7 +21,6 @@
 import { strings } from "./i18n/strings.js";
 
 import * as pages from "./pages/index.stories.js";
-import * as forms from "./handlers/index.stories.js";
 
 import { renderStories } from "@gnu-taler/web-util/browser";
 
@@ -31,7 +30,7 @@ import { ExchangeApiContextTesting } from "./context/config.js";
 
 function main(): void {
   renderStories(
-    { pages, forms },
+    { pages },
     {
       strings,
       getWrapperForGroup