impl accout management and refactor

3 files changed, 59 insertions, 65 deletions

diff --git a/packages/demobank-ui/src/components/Transactions/index.ts b/packages/demobank-ui/src/components/Transactions/index.ts
index 0c9084946..e43b9401c 100644
--- a/packages/demobank-ui/src/components/Transactions/index.ts
+++ b/packages/demobank-ui/src/components/Transactions/index.ts
@@ -14,18 +14,16 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
+import { HttpError, utils } from "@gnu-taler/web-util/lib/index.browser";
 import { Loading } from "../Loading.js";
-import { HookError, utils } from "@gnu-taler/web-util/lib/index.browser";
 // import { compose, StateViewMap } from "../../utils/index.js";
 // import { wxApi } from "../../wxApi.js";
+import { AbsoluteTime, AmountJson } from "@gnu-taler/taler-util";
 import { useComponentState } from "./state.js";
 import { LoadingUriView, ReadyView } from "./views.js";
-import { AbsoluteTime, AmountJson } from "@gnu-taler/taler-util";
 
 export interface Props {
-  pageNumber: number;
-  accountLabel: string;
-  balanceValue?: string;
+  account: string;
 }
 
 export type State = State.Loading | State.LoadingUriError | State.Ready;
@@ -38,7 +36,7 @@ export namespace State {
 
   export interface LoadingUriError {
     status: "loading-error";
-    error: HookError;
+    error: HttpError<SandboxBackend.SandboxError>;
   }
 
   export interface BaseInfo {
diff --git a/packages/demobank-ui/src/components/Transactions/state.ts b/packages/demobank-ui/src/components/Transactions/state.ts
index a5087ef32..9e1bce39b 100644
--- a/packages/demobank-ui/src/components/Transactions/state.ts
+++ b/packages/demobank-ui/src/components/Transactions/state.ts
@@ -15,66 +15,65 @@
  */
 
 import { AbsoluteTime, Amounts } from "@gnu-taler/taler-util";
-import { parse } from "date-fns";
-import { useEffect } from "preact/hooks";
-import useSWR from "swr";
-import { Props, State } from "./index.js";
+import { useTransactions } from "../../hooks/access.js";
+import { Props, State, Transaction } from "./index.js";
 
 export function useComponentState({
-  accountLabel,
-  pageNumber,
-  balanceValue,
+  account,
 }: Props): State {
-  const { data, error, mutate } = useSWR(
-    `access-api/accounts/${accountLabel}/transactions?page=${pageNumber}`,
-  );
-
-  useEffect(() => {
-    if (balanceValue) {
-      mutate();
-    }
-  }, [balanceValue ?? ""]);
-
-  if (error) {
-    switch (error.status) {
-      case 404:
-        return {
-          status: "loading-error",
-          error: {
-            hasError: true,
-            operational: false,
-            message: `Transactions page ${pageNumber} was not found.`,
-          },
-        };
-      case 401:
-        return {
-          status: "loading-error",
-          error: {
-            hasError: true,
-            operational: false,
-            message: "Wrong credentials given.",
-          },
-        };
-      default:
-        return {
-          status: "loading-error",
-          error: {
-            hasError: true,
-            operational: false,
-            message: `Transaction page ${pageNumber} could not be retrieved.`,
-          } as any,
-        };
+  const result = useTransactions(account)
+  if (result.loading) {
+    return {
+      status: "loading",
+      error: undefined
     }
   }
-
-  if (!data) {
+  if (!result.ok) {
     return {
-      status: "loading",
-      error: undefined,
-    };
+      status: "loading-error",
+      error: result
+    }
   }
+  // if (error) {
+  //   switch (error.status) {
+  //     case 404:
+  //       return {
+  //         status: "loading-error",
+  //         error: {
+  //           hasError: true,
+  //           operational: false,
+  //           message: `Transactions page ${pageNumber} was not found.`,
+  //         },
+  //       };
+  //     case 401:
+  //       return {
+  //         status: "loading-error",
+  //         error: {
+  //           hasError: true,
+  //           operational: false,
+  //           message: "Wrong credentials given.",
+  //         },
+  //       };
+  //     default:
+  //       return {
+  //         status: "loading-error",
+  //         error: {
+  //           hasError: true,
+  //           operational: false,
+  //           message: `Transaction page ${pageNumber} could not be retrieved.`,
+  //         } as any,
+  //       };
+  //   }
+  // }
+
+  // if (!data) {
+  //   return {
+  //     status: "loading",
+  //     error: undefined,
+  //   };
+  // }
 
-  const transactions = data.transactions.map((item: unknown) => {
+  const transactions = result.data.transactions.map((item: unknown) => {
     if (
       !item ||
       typeof item !== "object" ||
@@ -120,7 +119,7 @@ export function useComponentState({
       amount,
       subject,
     };
-  });
+  }).filter((x): x is Transaction => x !== undefined);
 
   return {
     status: "ready",
diff --git a/packages/demobank-ui/src/components/Transactions/test.ts b/packages/demobank-ui/src/components/Transactions/test.ts
index 21a0eefbb..3f2d5fb68 100644
--- a/packages/demobank-ui/src/components/Transactions/test.ts
+++ b/packages/demobank-ui/src/components/Transactions/test.ts
@@ -31,8 +31,7 @@ describe("Transaction states", () => {
     const env = new SwrMockEnvironment();
 
     const props: Props = {
-      accountLabel: "myAccount",
-      pageNumber: 0,
+      account: "myAccount",
     };
 
     env.addRequestExpectation(TRANSACTION_API_EXAMPLE.LIST_FIRST_PAGE, {
@@ -116,8 +115,7 @@ describe("Transaction states", () => {
     const env = new SwrMockEnvironment();
 
     const props: Props = {
-      accountLabel: "myAccount",
-      pageNumber: 0,
+      account: "myAccount",
     };
 
     env.addRequestExpectation(TRANSACTION_API_EXAMPLE.LIST_NOT_FOUND, {});
@@ -150,8 +148,7 @@ describe("Transaction states", () => {
     const env = new SwrMockEnvironment(false);
 
     const props: Props = {
-      accountLabel: "myAccount",
-      pageNumber: 0,
+      account: "myAccount",
     };
 
     env.addRequestExpectation(TRANSACTION_API_EXAMPLE.LIST_ERROR, {});