1 files changed, 12 insertions, 37 deletions

diff --git a/packages/aml-backoffice-ui/src/forms/902_1e.ts b/packages/aml-backoffice-ui/src/forms/902_1e.ts
index c212efb1a..2cd16b840 100644
--- a/packages/aml-backoffice-ui/src/forms/902_1e.ts
+++ b/packages/aml-backoffice-ui/src/forms/902_1e.ts
@@ -1,36 +1,13 @@
 import { AbsoluteTime, TranslatedString } from "@gnu-taler/taler-util";
 import { FormState } from "../handlers/FormProvider.js";
-import { State } from "../pages/AntiMoneyLaunderingForm.js";
+import { BaseForm } from "../pages/AntiMoneyLaunderingForm.js";
 import { FlexibleForm, languageList } from "./index.js";
-import { Simplest, resolutionSection } from "./simplest.js";
+import { resolutionSection } from "./simplest.js";
 
-export const v1 = (current: State): FlexibleForm<Form902_1.Form> => ({
+export const v1 = (current: BaseForm): FlexibleForm<Form902_1.Form> => ({
   versionId: "2023-05-15",
   design: [
     {
-      title: "This form was completed by" as TranslatedString,
-      description:
-        "The customer has to be identified on entering into a permanent business relationship or on concluding a cash transaction, which meets the according threshold." as TranslatedString,
-      fields: [
-        {
-          type: "text",
-          props: {
-            name: "fullName",
-            label: "Full name" as TranslatedString,
-          },
-        },
-        {
-          type: "date",
-          props: {
-            name: "when",
-            pattern: "dd/MM/yyyy",
-            label: "Date" as TranslatedString,
-            help: "format 'dd/MM/yyyy'" as TranslatedString,
-          },
-        },
-      ],
-    },
-    {
       title: "Information on customer" as TranslatedString,
       description:
         "The customer is the person with whom the member concludes the contract with regard to the financial service provided (civil law). Does the member act as director of a domiciliary company, this domiciliary company is the customer." as TranslatedString,
@@ -89,6 +66,7 @@ export const v1 = (current: State): FlexibleForm<Form902_1.Form> => ({
             name: "naturalCustomer.dateOfBirth",
             label: "Date of birth" as TranslatedString,
             required: true,
+            // help: "format 'dd/MM/yyyy'" as TranslatedString,
           },
         },
         {
@@ -244,7 +222,7 @@ export const v1 = (current: State): FlexibleForm<Form902_1.Form> => ({
                   name: "dateOfBirth",
                   label: "Date of birth" as TranslatedString,
                   required: true,
-                  help: "format 'dd/MM/yyyy'" as TranslatedString,
+                  // help: "format 'dd/MM/yyyy'" as TranslatedString,
                 },
               },
               {
@@ -321,7 +299,7 @@ export const v1 = (current: State): FlexibleForm<Form902_1.Form> => ({
             name: "acceptance.when",
             pattern: "dd/MM/yyyy",
             label: "Date (conclusion of contract)" as TranslatedString,
-            help: "format 'dd/MM/yyyy'" as TranslatedString,
+            // help: "format 'dd/MM/yyyy'" as TranslatedString,
           },
         },
         {
@@ -520,9 +498,6 @@ export const v1 = (current: State): FlexibleForm<Form902_1.Form> => ({
       fullName: {
         disabled: true,
       },
-      when: {
-        disabled: true,
-      },
       businessEstablisher: {
         elements: (v.businessEstablisher ?? []).map((be) => {
           return {
@@ -659,11 +634,11 @@ namespace Form902_1 {
 
   interface BeneficialOwner {
     establishment:
-      | "natural-person"
-      | "foundation"
-      | "trust"
-      | "insurance-wrapper"
-      | "other";
+    | "natural-person"
+    | "foundation"
+    | "trust"
+    | "insurance-wrapper"
+    | "other";
   }
 
   interface CashTransactions {
@@ -672,7 +647,7 @@ namespace Form902_1 {
     purpose: string;
   }
 
-  export interface Form extends Simplest.WithResolution {
+  export interface Form extends BaseForm {
     fullName: string;
     customerType: "natural" | "legal";
     naturalCustomer: NaturalCustomer;