1 files changed, 52 insertions, 43 deletions

diff --git a/packages/aml-backoffice-ui/src/pages/CaseDetails.tsx b/packages/aml-backoffice-ui/src/pages/CaseDetails.tsx
index bb936cebf..2fd95d2c6 100644
--- a/packages/aml-backoffice-ui/src/pages/CaseDetails.tsx
+++ b/packages/aml-backoffice-ui/src/pages/CaseDetails.tsx
@@ -45,7 +45,7 @@ import { useState } from "preact/hooks";
 import { privatePages } from "../Routing.js";
 import { useUiFormsContext } from "../context/ui-forms.js";
 import { preloadedForms } from "../forms/index.js";
-import { useCaseDetails } from "../hooks/useCaseDetails.js";
+import { useAccountInformation } from "../hooks/account.js";
 import { ShowConsolidated } from "./ShowConsolidated.js";
 
 export type AmlEvent =
@@ -77,7 +77,7 @@ type KycCollectionEvent = {
   when: AbsoluteTime;
   title: TranslatedString;
   values: object;
-  provider: string;
+  provider?: string;
 };
 type KycExpirationEvent = {
   type: "kyc-expiration";
@@ -115,45 +115,54 @@ function titleForJustification(
 }
 
 export function getEventsFromAmlHistory(
-  aml: TalerExchangeApi.AmlDecisionDetail[],
-  kyc: TalerExchangeApi.KycDetail[],
+  events: TalerExchangeApi.KycAttributeCollectionEvent[],
   i18n: InternationalizationAPI,
   forms: FormMetadata[],
 ): AmlEvent[] {
-  const ae: AmlEvent[] = aml.map((a) => {
-    const just = parseJustification(a.justification, forms);
+  // const ae: AmlEvent[] = aml.map((a) => {
+  //   const just = parseJustification(a.justification, forms);
+  //   return {
+  //     type: just.type === "ok" ? "aml-form" : "aml-form-error",
+  //     state: a.new_state,
+  //     threshold: Amounts.parseOrThrow(a.new_threshold),
+  //     title: titleForJustification(just, i18n),
+  //     metadata: just.type === "ok" ? just.body.metadata : undefined,
+  //     justification: just.type === "ok" ? just.body.justification : undefined,
+  //     when: {
+  //       t_ms:
+  //         a.decision_time.t_s === "never"
+  //           ? "never"
+  //           : a.decision_time.t_s * 1000,
+  //     },
+  //   } as AmlEvent;
+  // });
+  // const ke = kyc.reduce((prev, k) => {
+  //   prev.push({
+  //     type: "kyc-collection",
+  //     title: i18n.str`collection`,
+  //     when: AbsoluteTime.fromProtocolTimestamp(k.collection_time),
+  //     values: !k.attributes ? {} : k.attributes,
+  //     provider: k.provider_section,
+  //   });
+  //   prev.push({
+  //     type: "kyc-expiration",
+  //     title: i18n.str`expiration`,
+  //     when: AbsoluteTime.fromProtocolTimestamp(k.expiration_time),
+  //     fields: !k.attributes ? [] : Object.keys(k.attributes),
+  //   });
+  //   return prev;
+  // }, [] as AmlEvent[]);
+
+  const ke = events.map((event) => {
     return {
-      type: just.type === "ok" ? "aml-form" : "aml-form-error",
-      state: a.new_state,
-      threshold: Amounts.parseOrThrow(a.new_threshold),
-      title: titleForJustification(just, i18n),
-      metadata: just.type === "ok" ? just.body.metadata : undefined,
-      justification: just.type === "ok" ? just.body.justification : undefined,
-      when: {
-        t_ms:
-          a.decision_time.t_s === "never"
-            ? "never"
-            : a.decision_time.t_s * 1000,
-      },
-    } as AmlEvent;
-  });
-  const ke = kyc.reduce((prev, k) => {
-    prev.push({
       type: "kyc-collection",
       title: i18n.str`collection`,
-      when: AbsoluteTime.fromProtocolTimestamp(k.collection_time),
-      values: !k.attributes ? {} : k.attributes,
-      provider: k.provider_section,
-    });
-    prev.push({
-      type: "kyc-expiration",
-      title: i18n.str`expiration`,
-      when: AbsoluteTime.fromProtocolTimestamp(k.expiration_time),
-      fields: !k.attributes ? [] : Object.keys(k.attributes),
-    });
-    return prev;
-  }, [] as AmlEvent[]);
-  return ae.concat(ke).sort(selectSooner);
+      when: AbsoluteTime.fromProtocolTimestamp(event.collection_time),
+      values: !event.attributes ? {} : event.attributes,
+      provider: event.provider_name,
+    } as AmlEvent
+  });
+  return ke.sort(selectSooner);
 }
 
 export function CaseDetails({ account }: { account: string }) {
@@ -164,7 +173,7 @@ export function CaseDetails({ account }: { account: string }) {
   }>();
 
   const { i18n } = useTranslationContext();
-  const details = useCaseDetails(account);
+  const details = useAccountInformation(account);
   const { forms } = useUiFormsContext();
 
   const allForms = [...forms, ...preloadedForms(i18n)];
@@ -176,7 +185,7 @@ export function CaseDetails({ account }: { account: string }) {
   }
   if (details.type === "fail") {
     switch (details.case) {
-      case HttpStatusCode.Unauthorized:
+      // case HttpStatusCode.Unauthorized:
       case HttpStatusCode.Forbidden:
       case HttpStatusCode.NotFound:
       case HttpStatusCode.Conflict:
@@ -185,11 +194,11 @@ export function CaseDetails({ account }: { account: string }) {
         assertUnreachable(details);
     }
   }
-  const { aml_history, kyc_attributes } = details.body;
+  const { details: accountDetails } = details.body;
+
 
   const events = getEventsFromAmlHistory(
-    aml_history,
-    kyc_attributes,
+    accountDetails,
     i18n,
     allForms,
   );
@@ -424,9 +433,9 @@ function parseJustification(
   listOfAllKnownForms: FormMetadata[],
 ):
   | OperationOk<{
-      justification: Justification;
-      metadata: FormMetadata;
-    }>
+    justification: Justification;
+    metadata: FormMetadata;
+  }>
   | OperationFail<ParseJustificationFail> {
   try {
     const justification = JSON.parse(s);