fix broken build merchant backoffice

18 files changed, 21 insertions, 15 deletions

diff --git a/packages/merchant-backoffice-ui/src/components/product/InventoryProductForm.tsx b/packages/merchant-backoffice-ui/src/components/product/InventoryProductForm.tsx
index 52ac2a1fe..3d15918dc 100644
--- a/packages/merchant-backoffice-ui/src/components/product/InventoryProductForm.tsx
+++ b/packages/merchant-backoffice-ui/src/components/product/InventoryProductForm.tsx
@@ -21,6 +21,7 @@ import { FormErrors, FormProvider } from "../form/FormProvider.js";
 import { InputNumber } from "../form/InputNumber.js";
 import { InputSearchOnList } from "../form/InputSearchOnList.js";
 import { TalerMerchantApi } from "@gnu-taler/taler-util";
+import { WithId } from "../../declaration.js";
 
 type Form = {
   product: TalerMerchantApi.ProductDetail & WithId;
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/accounts/update/UpdatePage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/accounts/update/UpdatePage.tsx
index c4ba1f0f2..00833071b 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/accounts/update/UpdatePage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/accounts/update/UpdatePage.tsx
@@ -32,6 +32,7 @@ import { Input } from "../../../../components/form/Input.js";
 import { InputPaytoForm } from "../../../../components/form/InputPaytoForm.js";
 import { InputSelector } from "../../../../components/form/InputSelector.js";
 import { undefinedIfEmpty } from "../../../../utils/table.js";
+import { WithId } from "../../../../declaration.js";
 
 type Entity = TalerMerchantApi.BankAccountEntry & WithId;
 
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/accounts/update/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/accounts/update/index.tsx
index 9116aaa62..1ada0c8d7 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/accounts/update/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/accounts/update/index.tsx
@@ -35,6 +35,7 @@ import { LoginPage } from "../../../login/index.js";
 import { NotFoundPageOrAdminCreate } from "../../../notfound/index.js";
 import { TestRevenueErrorType, testRevenueAPI } from "../create/index.js";
 import { UpdatePage } from "./UpdatePage.js";
+import { WithId } from "../../../../declaration.js";
 
 export type Entity = TalerMerchantApi.AccountPatchDetails & WithId;
 
@@ -88,7 +89,6 @@ export default function UpdateValidator({
             const resp = await testRevenueAPI(
               revenueAPI,
               request.credit_facade_credentials,
-              result.body.payto_uri,
             );
             if (resp instanceof TalerError) {
               setNotif({
@@ -127,14 +127,6 @@ export default function UpdateValidator({
                   });
                   return;
                 }
-                case TestRevenueErrorType.ANOTHER_ACCOUNT: {
-                  setNotif({
-                    message: i18n.str`Could not add bank account`,
-                    type: "ERROR",
-                    description: i18n.str`The account info URL returned information from an account which is not the same in the account form: ${resp.detail.hint}`,
-                  });
-                  return;
-                }
                 default: {
                   assertUnreachable(resp);
                 }
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/orders/create/CreatePage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/orders/create/CreatePage.tsx
index 29c50fb07..151905b5e 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/orders/create/CreatePage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/orders/create/CreatePage.tsx
@@ -52,6 +52,7 @@ import { useSessionContext } from "../../../../context/session.js";
 import { usePreference } from "../../../../hooks/preference.js";
 import { rate } from "../../../../utils/amount.js";
 import { undefinedIfEmpty } from "../../../../utils/table.js";
+import { WithId } from "../../../../declaration.js";
 
 interface Props {
   onCreate: (d: TalerMerchantApi.PostOrderRequest) => void;
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/orders/list/ListPage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/orders/list/ListPage.tsx
index 408bc0c0a..4681f9943 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/orders/list/ListPage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/orders/list/ListPage.tsx
@@ -27,6 +27,7 @@ import { useState } from "preact/hooks";
 import { DatePicker } from "../../../../components/picker/DatePicker.js";
 import { dateFormatForSettings, usePreference } from "../../../../hooks/preference.js";
 import { CardTable } from "./Table.js";
+import { WithId } from "../../../../declaration.js";
 
 export interface ListPageProps {
   onShowAll: () => void;
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/orders/list/Table.tsx b/packages/merchant-backoffice-ui/src/paths/instance/orders/list/Table.tsx
index 5ece34409..7b9691fdd 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/orders/list/Table.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/orders/list/Table.tsx
@@ -41,6 +41,7 @@ import {
   usePreference,
 } from "../../../../hooks/preference.js";
 import { mergeRefunds } from "../../../../utils/amount.js";
+import { WithId } from "../../../../declaration.js";
 
 type Entity = TalerMerchantApi.OrderHistoryEntry & WithId;
 interface Props {
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/otp_devices/update/UpdatePage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/otp_devices/update/UpdatePage.tsx
index 35d67cbc6..7866b9cd9 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/otp_devices/update/UpdatePage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/otp_devices/update/UpdatePage.tsx
@@ -31,6 +31,7 @@ import {
 import { Input } from "../../../../components/form/Input.js";
 import { InputSelector } from "../../../../components/form/InputSelector.js";
 import { InputWithAddon } from "../../../../components/form/InputWithAddon.js";
+import { WithId } from "../../../../declaration.js";
 
 type Entity = TalerMerchantApi.OtpDevicePatchDetails & WithId;
 
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 99edb95c3..2fe3abaae 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
@@ -40,6 +40,7 @@ import { LoginPage } from "../../../login/index.js";
 import { NotFoundPageOrAdminCreate } from "../../../notfound/index.js";
 import { CreatedSuccessfully } from "../create/CreatedSuccessfully.js";
 import { UpdatePage } from "./UpdatePage.js";
+import { WithId } from "../../../../declaration.js";
 
 export type Entity = TalerMerchantApi.OtpDevicePatchDetails & WithId;
 
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/products/list/Table.tsx b/packages/merchant-backoffice-ui/src/paths/instance/products/list/Table.tsx
index 39e2fd0c7..08d42a8c9 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/products/list/Table.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/products/list/Table.tsx
@@ -32,6 +32,7 @@ import {
 import { InputCurrency } from "../../../../components/form/InputCurrency.js";
 import { InputNumber } from "../../../../components/form/InputNumber.js";
 import { dateFormatForSettings, usePreference } from "../../../../hooks/preference.js";
+import { WithId } from "../../../../declaration.js";
 
 type Entity = TalerMerchantApi.ProductDetail & WithId;
 
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/products/list/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/products/list/index.tsx
index 6ad0d4598..dc3e73850 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/products/list/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/products/list/index.tsx
@@ -38,6 +38,7 @@ import { Notification } from "../../../../utils/types.js";
 import { LoginPage } from "../../../login/index.js";
 import { NotFoundPageOrAdminCreate } from "../../../notfound/index.js";
 import { CardTable } from "./Table.js";
+import { WithId } from "../../../../declaration.js";
 
 interface Props {
   onCreate: () => void;
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/templates/update/UpdatePage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/templates/update/UpdatePage.tsx
index d284fda67..113cf5baa 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/templates/update/UpdatePage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/templates/update/UpdatePage.tsx
@@ -46,6 +46,7 @@ import { InputToggle } from "../../../../components/form/InputToggle.js";
 import { TextField } from "../../../../components/form/TextField.js";
 import { useSessionContext } from "../../../../context/session.js";
 import { useInstanceOtpDevices } from "../../../../hooks/otp.js";
+import { WithId } from "../../../../declaration.js";
 
 type Entity = {
   description?: string;
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/templates/update/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/templates/update/index.tsx
index 6185bd2a9..ad804831c 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/templates/update/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/templates/update/index.tsx
@@ -36,6 +36,7 @@ import { Notification } from "../../../../utils/types.js";
 import { LoginPage } from "../../../login/index.js";
 import { NotFoundPageOrAdminCreate } from "../../../notfound/index.js";
 import { UpdatePage } from "./UpdatePage.js";
+import { WithId } from "../../../../declaration.js";
 
 export type Entity = TalerMerchantApi.TemplatePatchDetails & WithId;
 
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/tokenfamilies/update/UpdatePage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/tokenfamilies/update/UpdatePage.tsx
index 184e37b9c..5641d261b 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/tokenfamilies/update/UpdatePage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/tokenfamilies/update/UpdatePage.tsx
@@ -1,6 +1,6 @@
 /*
  This file is part of GNU Taler
- (C) 2021-2023 Taler Systems S.A.
+ (C) 2021-2024 Taler Systems S.A.
 
  GNU Taler is free software; you can redistribute it and/or modify it under the
  terms of the GNU General Public License as published by the Free Software
@@ -19,18 +19,17 @@
  * @author Christian Blättler
  */
 
+import { Duration, TalerMerchantApi } from "@gnu-taler/taler-util";
 import { useTranslationContext } from "@gnu-taler/web-util/browser";
 import { h } from "preact";
 import { useState } from "preact/hooks";
 import * as yup from "yup";
-import { MerchantBackend, WithId } from "../../../../declaration.js";
-import { TokenFamilyUpdateSchema } from "../../../../schemas/index.js";
+import { AsyncButton } from "../../../../components/exception/AsyncButton.js";
 import { FormErrors, FormProvider } from "../../../../components/form/FormProvider.js";
 import { Input } from "../../../../components/form/Input.js";
 import { InputDate } from "../../../../components/form/InputDate.js";
 import { InputDuration } from "../../../../components/form/InputDuration.js";
-import { AsyncButton } from "../../../../components/exception/AsyncButton.js";
-import { Duration, TalerMerchantApi } from "@gnu-taler/taler-util";
+import { TokenFamilyUpdateSchema } from "../../../../schemas/index.js";
 
 type Entity = Omit<TalerMerchantApi.TokenFamilyUpdateRequest, "duration"> & {
   duration: Duration,
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/Table.tsx b/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/Table.tsx
index a6c9a00f9..5687d5e57 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/Table.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/Table.tsx
@@ -25,6 +25,7 @@ import { format } from "date-fns";
 import { h, VNode } from "preact";
 import { StateUpdater, useState } from "preact/hooks";
 import { datetimeFormatForSettings, usePreference } from "../../../../hooks/preference.js";
+import { WithId } from "../../../../declaration.js";
 
 type Entity = TalerMerchantApi.TransferDetails & WithId;
 
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/webhooks/update/UpdatePage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/webhooks/update/UpdatePage.tsx
index 6aca62582..bcd53ffd0 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/webhooks/update/UpdatePage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/webhooks/update/UpdatePage.tsx
@@ -29,6 +29,7 @@ import {
 } from "../../../../components/form/FormProvider.js";
 import { Input } from "../../../../components/form/Input.js";
 import { TalerMerchantApi } from "@gnu-taler/taler-util";
+import { WithId } from "../../../../declaration.js";
 
 type Entity = TalerMerchantApi.WebhookPatchDetails & WithId;
 
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/webhooks/update/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/webhooks/update/index.tsx
index 5b2ba7bb9..6c0466dad 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/webhooks/update/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/webhooks/update/index.tsx
@@ -36,6 +36,7 @@ import { Notification } from "../../../../utils/types.js";
 import { LoginPage } from "../../../login/index.js";
 import { NotFoundPageOrAdminCreate } from "../../../notfound/index.js";
 import { UpdatePage } from "./UpdatePage.js";
+import { WithId } from "../../../../declaration.js";
 
 export type Entity = TalerMerchantApi.WebhookPatchDetails & WithId;
 
diff --git a/packages/merchant-backoffice-ui/src/schemas/index.ts b/packages/merchant-backoffice-ui/src/schemas/index.ts
index 43384299b..77d23f49a 100644
--- a/packages/merchant-backoffice-ui/src/schemas/index.ts
+++ b/packages/merchant-backoffice-ui/src/schemas/index.ts
@@ -23,7 +23,6 @@ import { Amounts } from "@gnu-taler/taler-util";
 import { isAfter, isFuture } from "date-fns";
 import * as yup from "yup";
 import { PAYTO_REGEX } from "../utils/constants.js";
-import { Amounts } from "@gnu-taler/taler-util";
 import { MerchantBackend } from "../declaration.js";
 // import { MerchantBackend } from "../declaration.js";
 
diff --git a/packages/merchant-backoffice-ui/src/utils/table.ts b/packages/merchant-backoffice-ui/src/utils/table.ts
index 982b68e5e..5a94654f3 100644
--- a/packages/merchant-backoffice-ui/src/utils/table.ts
+++ b/packages/merchant-backoffice-ui/src/utils/table.ts
@@ -14,6 +14,8 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
+import { WithId } from "../declaration.js";
+
 
 /**
  *