wip #8655: fixing broken build

2 files changed, 38 insertions, 41 deletions

diff --git a/packages/merchant-backoffice-ui/src/paths/instance/transfers/create/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/transfers/create/index.tsx
index ac1d692a4..35389f5f5 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/transfers/create/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/transfers/create/index.tsx
@@ -19,8 +19,11 @@
  * @author Sebastian Javier Marchano (sebasjm)
  */
 
-import { TalerMerchantApi } from "@gnu-taler/taler-util";
-import { useMerchantApiContext, useTranslationContext } from "@gnu-taler/web-util/browser";
+import { TalerError, TalerMerchantApi } from "@gnu-taler/taler-util";
+import {
+  useMerchantApiContext,
+  useTranslationContext,
+} from "@gnu-taler/web-util/browser";
 import { Fragment, h, VNode } from "preact";
 import { useState } from "preact/hooks";
 import { NotificationCard } from "../../../../components/menu/index.js";
@@ -41,9 +44,10 @@ export default function CreateTransfer({ onConfirm, onBack }: Props): VNode {
   const [notif, setNotif] = useState<Notification | undefined>(undefined);
   const { i18n } = useTranslationContext();
   const instance = useInstanceBankAccounts();
-  const accounts = !instance.ok
-    ? []
-    : instance.data.accounts.map((a) => a.payto_uri);
+  const accounts =
+    !instance || instance instanceof TalerError || instance.type === "fail"
+      ? []
+      : instance.body.map((a) => a.payto_uri);
 
   return (
     <>
@@ -52,7 +56,8 @@ export default function CreateTransfer({ onConfirm, onBack }: Props): VNode {
         onBack={onBack}
         accounts={accounts}
         onCreate={(request: TalerMerchantApi.TransferInformation) => {
-          return lib.management.informWireTransfer(state.token, request)
+          return lib.management
+            .informWireTransfer(state.token, request)
             .then(() => onConfirm())
             .catch((error) => {
               setNotif({
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/index.tsx
index 15706b4c5..5edea377f 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/index.tsx
@@ -19,40 +19,34 @@
  * @author Sebastian Javier Marchano (sebasjm)
  */
 
-import { HttpStatusCode, TalerErrorDetail } from "@gnu-taler/taler-util";
-import { ErrorType, HttpError } from "@gnu-taler/web-util/browser";
+import { TalerError } from "@gnu-taler/taler-util";
 import { VNode, h } from "preact";
 import { useEffect, useState } from "preact/hooks";
+import { ErrorLoadingMerchant } from "../../../../components/ErrorLoadingMerchant.js";
 import { Loading } from "../../../../components/exception/loading.js";
 import { useInstanceBankAccounts } from "../../../../hooks/bank.js";
 import { useInstanceTransfers } from "../../../../hooks/transfer.js";
 import { ListPage } from "./ListPage.js";
 
 interface Props {
-  onUnauthorized: () => VNode;
-  onLoadError: (error: HttpError<TalerErrorDetail>) => VNode;
-  onNotFound: () => VNode;
   onCreate: () => void;
 }
 interface Form {
-  verified?: "yes" | "no";
+  verified?: boolean;
   payto_uri?: string;
 }
 
 export default function ListTransfer({
-  onUnauthorized,
-  onLoadError,
   onCreate,
-  onNotFound,
 }: Props): VNode {
-  const setFilter = (s?: "yes" | "no") => setForm({ ...form, verified: s });
+  const setFilter = (s?: boolean) => setForm({ ...form, verified: s });
 
   const [position, setPosition] = useState<string | undefined>(undefined);
 
   const instance = useInstanceBankAccounts();
-  const accounts = !instance.ok
+  const accounts = !instance || (instance instanceof TalerError) || instance.type === "fail"
     ? []
-    : instance.data.accounts.map((a) => a.payto_uri);
+    : instance.body.map((a) => a.payto_uri);
   const [form, setForm] = useState<Form>({ payto_uri: "" });
 
   const shoulUseDefaultAccount = accounts.length === 1
@@ -62,8 +56,8 @@ export default function ListTransfer({
     }
   }, [shoulUseDefaultAccount])
 
-  const isVerifiedTransfers = form.verified === "yes";
-  const isNonVerifiedTransfers = form.verified === "no";
+  const isVerifiedTransfers = form.verified === true;
+  const isNonVerifiedTransfers = form.verified === false;
   const isAllTransfers = form.verified === undefined;
 
   const result = useInstanceTransfers(
@@ -75,37 +69,35 @@ export default function ListTransfer({
     (id) => setPosition(id),
   );
 
-  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} />;
   }
+  // if (result.type === "fail") {
+  //   switch (result.case) {
+  //     case HttpStatusCode.NotFound: {
+  //       return <NotFoundPageOrAdminCreate />;
+  //     }
+  //     default: {
+  //       assertUnreachable(result.case);
+  //     }
+  //   }
+  // }
+
 
   return (
     <ListPage
       accounts={accounts}
-      transfers={result.data.transfers}
-      onLoadMoreBefore={
-        result.isReachingStart ? result.loadMorePrev : undefined
-      }
-      onLoadMoreAfter={result.isReachingEnd ? result.loadMore : undefined}
+      transfers={result.body}
+      onLoadMoreBefore={result.isFirstPage ? undefined: result.loadFirst }
+      onLoadMoreAfter={result.isLastPage ? undefined : result.loadNext}
       onCreate={onCreate}
       onDelete={() => {
         null;
       }}
-      // position={position} setPosition={setPosition}
       onShowAll={() => setFilter(undefined)}
-      onShowUnverified={() => setFilter("no")}
-      onShowVerified={() => setFilter("yes")}
+      onShowUnverified={() => setFilter(false)}
+      onShowVerified={() => setFilter(true)}
       isAllTransfers={isAllTransfers}
       isVerifiedTransfers={isVerifiedTransfers}
       isNonVerifiedTransfers={isNonVerifiedTransfers}