1 files changed, 9 insertions, 42 deletions

diff --git a/packages/aml-backoffice-ui/src/pages/NewFormEntry.tsx b/packages/aml-backoffice-ui/src/pages/NewFormEntry.tsx
index b291ffbee..e70536cb2 100644
--- a/packages/aml-backoffice-ui/src/pages/NewFormEntry.tsx
+++ b/packages/aml-backoffice-ui/src/pages/NewFormEntry.tsx
@@ -1,5 +1,5 @@
 import { VNode, h } from "preact";
-import { allForms } from "./AntiMoneyLaunderingForm.js";
+import { AntiMoneyLaunderingForm, allForms } from "./AntiMoneyLaunderingForm.js";
 import { Pages } from "../pages.js";
 import { NiceForm } from "../NiceForm.js";
 import { AbsoluteTime, Amounts, TalerExchangeApi, TalerProtocolTimestamp } from "@gnu-taler/taler-util";
@@ -31,60 +31,27 @@ export function NewFormEntry({
   if (Number.isNaN(selectedForm)) {
     return <div>WHAT! {type}</div>;
   }
-  const showingFrom = allForms[selectedForm].impl;
-  const formName = allForms[selectedForm].name
-  const initial = {
-    fullName: "loggedIn_user_fullname",
-    when: AbsoluteTime.now(),
-    state: AmlExchangeBackend.AmlState.pending,
-    threshold: Amounts.parseOrThrow("KUDOS:1000"),
-  };
+
   const { api } = useExchangeApiContext()
 
   return (
-    <NiceForm
-      initial={initial}
-      form={showingFrom(initial)}
-      onSubmit={(formValue) => {
-        if (formValue.state === undefined || formValue.threshold === undefined) return;
-
-        const justification = {
-          index: selectedForm,
-          name: formName,
-          value: formValue
-        }
+    <AntiMoneyLaunderingForm
+      account={account}
+      selectedForm={selectedForm}
+      onSubmit={async (justification, new_state, new_threshold) => {
         const decision: TalerExchangeApi.AmlDecision = {
           justification: JSON.stringify(justification),
           decision_time: TalerProtocolTimestamp.now(),
           h_payto: account,
-          new_state: formValue.state,
-          new_threshold: Amounts.stringify(formValue.threshold),
+          new_state,
+          new_threshold: Amounts.stringify(new_threshold),
           officer_sig: "",
           kyc_requirements: undefined
         }
-        // const signature = buildDecisionSignature(officer.account.signingKey, decision);
-        // decision.officer_sig = signature
         api.addDecisionDetails(officer.account, decision);
 
-        // alert(JSON.stringify(formValue));
       }}
-    >
-      <div class="mt-6 flex items-center justify-end gap-x-6">
-        <a
-          //   type="button"
-          href={Pages.account.url({ account })}
-          class="text-sm font-semibold leading-6 text-gray-900"
-        >
-          Cancel
-        </a>
-        <button
-          type="submit"
-          class="rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
-        >
-          Confirm
-        </button>
-      </div>
-    </NiceForm>
+    />
   );
 }