1 files changed, 38 insertions, 15 deletions
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/kyc/list/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/kyc/list/index.tsx
index 555eb47b9..9d0bd2e16 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/kyc/list/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/kyc/list/index.tsx
@@ -24,7 +24,8 @@ import { h, VNode } from "preact";
 import { Loading } from "../../../../components/exception/loading.js";
 import { useInstanceKYCDetails } from "../../../../hooks/instance.js";
 import { ListPage } from "./ListPage.js";
-import { HttpStatusCode, TalerErrorDetail } from "@gnu-taler/taler-util";
+import { HttpStatusCode, TalerError, TalerErrorDetail } from "@gnu-taler/taler-util";
+import { ErrorLoadingMerchant } from "../../../../components/ErrorLoadingMerchant.js";
 
 interface Props {
   onUnauthorized: () => VNode;
@@ -38,22 +39,44 @@ export default function ListKYC({
   onNotFound,
 }: Props): VNode {
   const result = useInstanceKYCDetails();
-  if (result.loading) return <Loading />;
-  if (!result.ok) {
-    if (
-      result.type === ErrorType.CLIENT &&
-      result.status === HttpStatusCode.Unauthorized
-    )
-      return onUnauthorized();
-    if (
-      result.type === ErrorType.CLIENT &&
-      result.status === HttpStatusCode.NotFound
-    )
-      return onNotFound();
-    return onLoadError(result);
+  if (!result) return <Loading />
+  if (result instanceof TalerError) {
+    return <ErrorLoadingMerchant error={result} />
   }
+  // if (result.loading) return <Loading />;
+  // if (!result.ok) {
+  //   if (
+  //     result.type === ErrorType.CLIENT &&
+  //     result.status === HttpStatusCode.Unauthorized
+  //   )
+  //     return onUnauthorized();
+  //   if (
+  //     result.type === ErrorType.CLIENT &&
+  //     result.status === HttpStatusCode.NotFound
+  //   )
+  //     return onNotFound();
+  //   return onLoadError(result);
+  // }
+  if (result.type === "fail") {
+    switch (result.case) {
+      case HttpStatusCode.GatewayTimeout: {
+        return <div />
+      }
+      case HttpStatusCode.BadGateway: {
+        const status = result.body;
 
-  const status = result.data.type === "ok" ? undefined : result.data.status;
+        if (!status) {
+          return <div>no kyc required</div>;
+        }
+        return <ListPage status={status} />;
+
+      }
+      case HttpStatusCode.ServiceUnavailable: {
+        return <div />
+      }
+    }
+  }
+  const status = result.body;
 
   if (!status) {
     return <div>no kyc required</div>;