1 files changed, 60 insertions, 38 deletions

diff --git a/packages/merchant-backoffice-ui/src/paths/instance/otp_devices/update/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/otp_devices/update/index.tsx
index 6b9970eab..43adbe253 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/otp_devices/update/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/otp_devices/update/index.tsx
@@ -19,20 +19,25 @@
  * @author Sebastian Javier Marchano (sebasjm)
  */
 
-import { HttpStatusCode, TalerErrorDetail, TalerMerchantApi } from "@gnu-taler/taler-util";
 import {
-  ErrorType,
-  HttpError,
+  HttpStatusCode,
+  TalerError,
+  TalerMerchantApi,
+  assertUnreachable
+} from "@gnu-taler/taler-util";
+import {
   useMerchantApiContext,
-  useTranslationContext,
+  useTranslationContext
 } from "@gnu-taler/web-util/browser";
 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 { useOtpDeviceDetails } from "../../../../hooks/otp.js";
 import { Notification } from "../../../../utils/types.js";
+import { NotFoundPageOrAdminCreate } from "../../../notfound/index.js";
 import { CreatedSuccessfully } from "../create/CreatedSuccessfully.js";
 import { UpdatePage } from "./UpdatePage.js";
 
@@ -41,44 +46,39 @@ export type Entity = TalerMerchantApi.OtpDevicePatchDetails & WithId;
 interface Props {
   onBack?: () => void;
   onConfirm: () => void;
-  onUnauthorized: () => VNode;
-  onNotFound: () => VNode;
-  onLoadError: (e: HttpError<TalerErrorDetail>) => VNode;
   vid: string;
 }
 export default function UpdateValidator({
   vid,
   onConfirm,
   onBack,
-  onUnauthorized,
-  onNotFound,
-  onLoadError,
 }: Props): VNode {
   const result = useOtpDeviceDetails(vid);
   const [notif, setNotif] = useState<Notification | undefined>(undefined);
-  const [keyUpdated, setKeyUpdated] = useState<TalerMerchantApi.OtpDeviceAddDetails | null>(null)
+  const [keyUpdated, setKeyUpdated] =
+    useState<TalerMerchantApi.OtpDeviceAddDetails | null>(null);
   const { lib } = useMerchantApiContext();
   const { state } = useSessionContext();
 
   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);
+      }
+    }
   }
 
   if (keyUpdated) {
-    return <CreatedSuccessfully entity={keyUpdated} onConfirm={onConfirm} />
+    return <CreatedSuccessfully entity={keyUpdated} onConfirm={onConfirm} />;
   }
 
   return (
@@ -87,25 +87,47 @@ export default function UpdateValidator({
       <UpdatePage
         device={{
           id: vid,
-          otp_algorithm: result.data.otp_algorithm,
-          otp_device_description: result.data.device_description,
+          otp_algorithm: result.body.otp_algorithm,
+          otp_device_description: result.body.device_description,
           otp_key: "",
-          otp_ctr: result.data.otp_ctr
+          otp_ctr: result.body.otp_ctr,
         }}
         onBack={onBack}
         onUpdate={async (newInfo) => {
-          return lib.management.updateOtpDevice(state.token, vid, newInfo)
+          return lib.management
+            .updateOtpDevice(state.token, vid, newInfo)
             .then((d) => {
-              if (newInfo.otp_key) {
-                setKeyUpdated({
-                  otp_algorithm: newInfo.otp_algorithm,
-                  otp_device_description: newInfo.otp_device_description,
-                  otp_device_id: newInfo.id,
-                  otp_key: newInfo.otp_key,
-                  otp_ctr: newInfo.otp_ctr,
-                })
+              if (d.type === "ok") {
+                if (newInfo.otp_key) {
+                  setKeyUpdated({
+                    otp_algorithm: newInfo.otp_algorithm,
+                    otp_device_description: newInfo.otp_device_description,
+                    otp_device_id: newInfo.id,
+                    otp_key: newInfo.otp_key,
+                    otp_ctr: newInfo.otp_ctr,
+                  });
+                } else {
+                  onConfirm();
+                }
               } else {
-                onConfirm()
+                switch(d.case) {
+                  case HttpStatusCode.NotFound: {
+                    setNotif({
+                      message: i18n.str`Could not update template`,
+                      type: "ERROR",
+                      description: i18n.str`Template id is unknown`,
+                    });
+                    break;
+                  }
+                  case HttpStatusCode.Conflict: {
+                    setNotif({
+                      message: i18n.str`Could not update template`,
+                      type: "ERROR",
+                      description: i18n.str`The provided information is inconsistent with the current state of the template`,
+                    });
+                    break;
+                  }
+                }
               }
             })
             .catch((error) => {