fix #8279

2 files changed, 21 insertions, 20 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 c833b908c..0274d6caa 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx
@@ -80,7 +80,7 @@ export function DetailPage({
       ? (form.old_token as AccessToken)
       : undefined;
     const newToken = form.new_token as AccessToken;
-    onNewToken(oldToken, newToken);
+    onNewToken(oldToken, `secret-token:${newToken}` as AccessToken);
   }
 
   return (
@@ -159,25 +159,26 @@ export function DetailPage({
                   inputType="password"
                 />
               </Fragment>
+              <div class="buttons is-right mt-5">
+                {onBack && (
+                  <a class="button" onClick={onBack}>
+                    <i18n.Translate>Cancel</i18n.Translate>
+                  </a>
+                )}
+                <AsyncButton
+                  type="submit"
+                  disabled={hasErrors}
+                  data-tooltip={
+                    hasErrors
+                      ? i18n.str`Need to complete marked fields`
+                      : "confirm operation"
+                  }
+                  onClick={submitForm}
+                >
+                  <i18n.Translate>Confirm change</i18n.Translate>
+                </AsyncButton>
+              </div>
             </FormProvider>
-            <div class="buttons is-right mt-5">
-              {onBack && (
-                <button class="button" onClick={onBack}>
-                  <i18n.Translate>Cancel</i18n.Translate>
-                </button>
-              )}
-              <AsyncButton
-                disabled={hasErrors}
-                data-tooltip={
-                  hasErrors
-                    ? i18n.str`Need to complete marked fields`
-                    : "confirm operation"
-                }
-                onClick={submitForm}
-              >
-                <i18n.Translate>Confirm change</i18n.Translate>
-              </AsyncButton>
-            </div>
           </div>
           <div class="column" />
         </div>
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 f3c9a52ea..f7129d279 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
@@ -61,7 +61,7 @@ export default function Token({
     return onLoadError(result);
   }
 
-  const hasToken = result.data.auth.type === "token"
+  const hasToken = result.data.auth.method === "token"
 
   return (
     <Fragment>