1 files changed, 20 insertions, 26 deletions

diff --git a/packages/merchant-backoffice-ui/src/paths/instance/webhooks/update/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/webhooks/update/index.tsx
index aecb4b947..1c3172ffd 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/webhooks/update/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/webhooks/update/index.tsx
@@ -19,41 +19,35 @@
  * @author Sebastian Javier Marchano (sebasjm)
  */
 
+import { HttpStatusCode, TalerError, TalerMerchantApi, assertUnreachable } from "@gnu-taler/taler-util";
 import {
-  ErrorType,
-  HttpError,
   useMerchantApiContext,
-  useTranslationContext,
+  useTranslationContext
 } from "@gnu-taler/web-util/browser";
-import { Fragment, h, VNode } from "preact";
+import { Fragment, VNode, h } from "preact";
 import { useState } from "preact/hooks";
+import { ErrorLoadingMerchant } from "../../../../components/ErrorLoadingMerchant.js";
 import { Loading } from "../../../../components/exception/loading.js";
 import { NotificationCard } from "../../../../components/menu/index.js";
+import { useSessionContext } from "../../../../context/session.js";
 import {
   useWebhookDetails,
 } from "../../../../hooks/webhooks.js";
 import { Notification } from "../../../../utils/types.js";
+import { NotFoundPageOrAdminCreate } from "../../../notfound/index.js";
 import { UpdatePage } from "./UpdatePage.js";
-import { HttpStatusCode, TalerErrorDetail, TalerMerchantApi } from "@gnu-taler/taler-util";
-import { useSessionContext } from "../../../../context/session.js";
 
 export type Entity = TalerMerchantApi.WebhookPatchDetails & WithId;
 
 interface Props {
   onBack?: () => void;
   onConfirm: () => void;
-  onUnauthorized: () => VNode;
-  onNotFound: () => VNode;
-  onLoadError: (e: HttpError<TalerErrorDetail>) => VNode;
   tid: string;
 }
 export default function UpdateWebhook({
   tid,
   onConfirm,
   onBack,
-  onUnauthorized,
-  onNotFound,
-  onLoadError,
 }: Props): VNode {
   const { lib } = useMerchantApiContext();
   const { state } = useSessionContext();
@@ -62,26 +56,26 @@ export default function UpdateWebhook({
 
   const { i18n } = useTranslationContext();
 
-  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.type === "fail") {
+    switch (result.case) {
+      case HttpStatusCode.NotFound: {
+        return <NotFoundPageOrAdminCreate />;
+      }
+      default: {
+        assertUnreachable(result.case);
+      }
+    }
   }
 
   return (
     <Fragment>
       <NotificationCard notification={notif} />
       <UpdatePage
-        webhook={{ ...result.data, id: tid }}
+        webhook={{ ...result.body, id: tid }}
         onBack={onBack}
         onUpdate={(data) => {
           return lib.management.updateWebhook(state.token, tid, data)