1 files changed, 23 insertions, 28 deletions

diff --git a/packages/merchant-backoffice-ui/src/hooks/instance.ts b/packages/merchant-backoffice-ui/src/hooks/instance.ts
index dfe97fd61..2da82989b 100644
--- a/packages/merchant-backoffice-ui/src/hooks/instance.ts
+++ b/packages/merchant-backoffice-ui/src/hooks/instance.ts
@@ -16,26 +16,23 @@
 import {
   HttpResponse,
   HttpResponseOk,
-  RequestError,
-  useMerchantApiContext,
+  RequestError
 } from "@gnu-taler/web-util/browser";
-import { MerchantBackend } from "../declaration.js";
 import {
   useBackendBaseRequest,
   useBackendInstanceRequest,
-  useCredentialsChecker,
   useMatchMutate,
 } from "./backend.js";
 
 // FIX default import https://github.com/microsoft/TypeScript/issues/49189
+import { AccessToken, TalerErrorDetail, TalerMerchantApi } from "@gnu-taler/taler-util";
 import _useSWR, { SWRHook, useSWRConfig } from "swr";
 import { useSessionContext } from "../context/session.js";
-import { AccessToken } from "@gnu-taler/taler-util";
 const useSWR = _useSWR as unknown as SWRHook;
 
 interface InstanceAPI {
   updateInstance: (
-    data: MerchantBackend.Instances.InstanceReconfigurationMessage,
+    data: TalerMerchantApi.InstanceReconfigurationMessage,
   ) => Promise<void>;
   deleteInstance: () => Promise<void>;
   clearAccessToken: (currentToken: AccessToken | undefined) => Promise<void>;
@@ -50,7 +47,7 @@ export function useAdminAPI(): AdminAPI {
   const mutateAll = useMatchMutate();
 
   const createInstance = async (
-    instance: MerchantBackend.Instances.InstanceConfigurationMessage,
+    instance: TalerMerchantApi.InstanceConfigurationMessage,
   ): Promise<void> => {
     await request(`/management/instances`, {
       method: "POST",
@@ -84,7 +81,7 @@ export function useAdminAPI(): AdminAPI {
 
 export interface AdminAPI {
   createInstance: (
-    data: MerchantBackend.Instances.InstanceConfigurationMessage,
+    data: TalerMerchantApi.InstanceConfigurationMessage,
   ) => Promise<void>;
   deleteInstance: (id: string) => Promise<void>;
   purgeInstance: (id: string) => Promise<void>;
@@ -98,10 +95,9 @@ export function useManagementAPI(instanceId: string): InstanceAPI {
     logOut,
   } = useSessionContext();
   const { request } = useBackendBaseRequest();
-  const { requestNewLoginToken } = useCredentialsChecker();
 
   const updateInstance = async (
-    instance: MerchantBackend.Instances.InstanceReconfigurationMessage,
+    instance: TalerMerchantApi.InstanceReconfigurationMessage,
   ): Promise<void> => {
     await request(`/management/instances/${instanceId}`, {
       method: "PATCH",
@@ -166,14 +162,13 @@ export function useInstanceAPI(): InstanceAPI {
   } = useSessionContext();
 
   const { request } = useBackendInstanceRequest();
-  const { requestNewLoginToken } = useCredentialsChecker();
   const { state, logIn, logOut } = useSessionContext();
 
   const adminToken =
     state.status === "loggedIn" && state.isAdmin ? state.token : undefined;
 
   const updateInstance = async (
-    instance: MerchantBackend.Instances.InstanceReconfigurationMessage,
+    instance: TalerMerchantApi.InstanceReconfigurationMessage,
   ): Promise<void> => {
     await request(`/private/`, {
       method: "PATCH",
@@ -239,14 +234,14 @@ export function useInstanceAPI(): InstanceAPI {
 }
 
 export function useInstanceDetails(): HttpResponse<
-  MerchantBackend.Instances.QueryInstancesResponse,
-  MerchantBackend.ErrorDetail
+  TalerMerchantApi.QueryInstancesResponse,
+  TalerErrorDetail
 > {
   const { fetcher } = useBackendInstanceRequest();
 
   const { data, error, isValidating } = useSWR<
-    HttpResponseOk<MerchantBackend.Instances.QueryInstancesResponse>,
-    RequestError<MerchantBackend.ErrorDetail>
+    HttpResponseOk<TalerMerchantApi.QueryInstancesResponse>,
+    RequestError<TalerErrorDetail>
   >([`/private/`], fetcher, {
     refreshInterval: 0,
     refreshWhenHidden: false,
@@ -267,17 +262,17 @@ export function useInstanceDetails(): HttpResponse<
 
 type KYCStatus =
   | { type: "ok" }
-  | { type: "redirect"; status: MerchantBackend.KYC.AccountKycRedirects };
+  | { type: "redirect"; status: TalerMerchantApi.AccountKycRedirects };
 
 export function useInstanceKYCDetails(): HttpResponse<
   KYCStatus,
-  MerchantBackend.ErrorDetail
+  TalerErrorDetail
 > {
   const { fetcher } = useBackendInstanceRequest();
 
   const { data, error } = useSWR<
-    HttpResponseOk<MerchantBackend.KYC.AccountKycRedirects>,
-    RequestError<MerchantBackend.ErrorDetail>
+    HttpResponseOk<TalerMerchantApi.AccountKycRedirects>,
+    RequestError<TalerErrorDetail>
   >([`/private/kyc`], fetcher, {
     refreshInterval: 60 * 1000,
     refreshWhenHidden: false,
@@ -303,14 +298,14 @@ export function useInstanceKYCDetails(): HttpResponse<
 export function useManagedInstanceDetails(
   instanceId: string,
 ): HttpResponse<
-  MerchantBackend.Instances.QueryInstancesResponse,
-  MerchantBackend.ErrorDetail
+  TalerMerchantApi.QueryInstancesResponse,
+  TalerErrorDetail
 > {
   const { request } = useBackendBaseRequest();
 
   const { data, error, isValidating } = useSWR<
-    HttpResponseOk<MerchantBackend.Instances.QueryInstancesResponse>,
-    RequestError<MerchantBackend.ErrorDetail>
+    HttpResponseOk<TalerMerchantApi.QueryInstancesResponse>,
+    RequestError<TalerErrorDetail>
   >([`/management/instances/${instanceId}`], request, {
     refreshInterval: 0,
     refreshWhenHidden: false,
@@ -329,14 +324,14 @@ export function useManagedInstanceDetails(
 }
 
 export function useBackendInstances(): HttpResponse<
-  MerchantBackend.Instances.InstancesResponse,
-  MerchantBackend.ErrorDetail
+  TalerMerchantApi.InstancesResponse,
+  TalerErrorDetail
 > {
   const { request } = useBackendBaseRequest();
 
   const { data, error, isValidating } = useSWR<
-    HttpResponseOk<MerchantBackend.Instances.InstancesResponse>,
-    RequestError<MerchantBackend.ErrorDetail>
+    HttpResponseOk<TalerMerchantApi.InstancesResponse>,
+    RequestError<TalerErrorDetail>
   >(["/management/instances"], request);
 
   if (isValidating) return { loading: true, data: data?.data };