1 files changed, 21 insertions, 15 deletions
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
index f7129d279..16a4bda22 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
@@ -13,7 +13,7 @@
  You should have received a copy of the GNU General Public License along with
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
-import { HttpStatusCode, TalerErrorDetail } from "@gnu-taler/taler-util";
+import { HttpStatusCode, TalerError, TalerErrorDetail } from "@gnu-taler/taler-util";
 import { ErrorType, HttpError, useMerchantApiContext, useTranslationContext } from "@gnu-taler/web-util/browser";
 import { Fragment, VNode, h } from "preact";
 import { useState } from "preact/hooks";
@@ -23,6 +23,7 @@ import { useSessionContext } from "../../../context/session.js";
 import { useInstanceDetails } from "../../../hooks/instance.js";
 import { Notification } from "../../../utils/types.js";
 import { DetailPage } from "./DetailPage.js";
+import { ErrorLoadingMerchant } from "../../../components/ErrorLoadingMerchant.js";
 
 interface Props {
   onUnauthorized: () => VNode;
@@ -46,22 +47,27 @@ export default function Token({
   // const { clearAccessToken } = useInstanceAPI();
   const result = useInstanceDetails()
 
-  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} />
   }
 
-  const hasToken = result.data.auth.method === "token"
+  // 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);
+  // }
+
+  const hasToken = result.body.auth.method === "token"
 
   return (
     <Fragment>