wip #8655: updating paginated queries

1 files changed, 8 insertions, 18 deletions

diff --git a/packages/merchant-backoffice-ui/src/paths/instance/accounts/list/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/accounts/list/index.tsx
index 8de6c763e..ab63d0d5f 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/accounts/list/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/accounts/list/index.tsx
@@ -19,7 +19,7 @@
  * @author Sebastian Javier Marchano (sebasjm)
  */
 
-import { HttpStatusCode, TalerErrorDetail, TalerMerchantApi } from "@gnu-taler/taler-util";
+import { HttpStatusCode, TalerError, TalerErrorDetail, TalerMerchantApi } from "@gnu-taler/taler-util";
 import {
   ErrorType,
   HttpError,
@@ -34,6 +34,7 @@ import { useInstanceBankAccounts } from "../../../../hooks/bank.js";
 import { Notification } from "../../../../utils/types.js";
 import { ListPage } from "./ListPage.js";
 import { useSessionContext } from "../../../../context/session.js";
+import { ErrorLoadingMerchant } from "../../../../components/ErrorLoadingMerchant.js";
 
 interface Props {
   onUnauthorized: () => VNode;
@@ -50,32 +51,21 @@ export default function ListOtpDevices({
   onSelect,
   onNotFound,
 }: Props): VNode {
-  const [position, setPosition] = useState<string | undefined>(undefined);
   const { i18n } = useTranslationContext();
   const [notif, setNotif] = useState<Notification | undefined>(undefined);
   const { lib: api } = useMerchantApiContext();
   const { state } = useSessionContext();
-  const result = useInstanceBankAccounts({ position }, (id) => setPosition(id));
+  const result = useInstanceBankAccounts();
 
-  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} />
   }
 
   return (
     <Fragment>
       <NotificationCard notification={notif} />
-      {result.data.accounts.length < 1 &&
+      {result.result.length < 1 &&
         <NotificationCard notification={{
           type: "WARN",
           message: i18n.str`You need to associate a bank account to receive revenue.`,
@@ -83,7 +73,7 @@ export default function ListOtpDevices({
         }} />
       }
       <ListPage
-        devices={result.data.accounts}
+        devices={result.result}
         onLoadMoreBefore={
           result.isReachingStart ? result.loadMorePrev : undefined
         }