1 files changed, 9 insertions, 9 deletions
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx
index 0274d6caa..f75ee89b8 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx
@@ -27,7 +27,7 @@ import { FormProvider } from "../../../components/form/FormProvider.js";
 import { Input } from "../../../components/form/Input.js";
 import { NotificationCard } from "../../../components/menu/index.js";
 import { useSessionContext } from "../../../context/session.js";
-import { AccessToken } from "@gnu-taler/taler-util";
+import { AccessToken, createAccessToken } from "@gnu-taler/taler-util";
 
 interface Props {
   hasToken: boolean | undefined;
@@ -67,7 +67,7 @@ export function DetailPage({
   };
 
   const hasErrors = Object.keys(errors).some(
-    (k) => (errors as any)[k] !== undefined,
+    (k) => (errors as Record<string, unknown>)[k] !== undefined,
   );
 
   const { state } = useSessionContext();
@@ -76,11 +76,12 @@ export function DetailPage({
 
   async function submitForm() {
     if (hasErrors) return;
-    const oldToken = hasToken
-      ? (form.old_token as AccessToken)
-      : undefined;
-    const newToken = form.new_token as AccessToken;
-    onNewToken(oldToken, `secret-token:${newToken}` as AccessToken);
+    const oldToken =
+      form.old_token !== undefined && hasToken
+        ? createAccessToken(form.old_token)
+        : undefined;
+    const newToken = createAccessToken(form.new_token!);
+    onNewToken(oldToken, newToken);
   }
 
   return (
@@ -133,8 +134,7 @@ export function DetailPage({
                         class="button"
                         onClick={() => {
                           if (hasToken) {
-                            const oldToken = form.old_token as AccessToken;
-                            onClearToken(oldToken);
+                            onClearToken(form.old_token ? createAccessToken(form.old_token) : undefined);
                           } else {
                             onClearToken(undefined);
                           }