integrate bank into the new taler-util API

1 files changed, 34 insertions, 26 deletions

diff --git a/packages/demobank-ui/src/pages/WalletWithdrawForm.tsx b/packages/demobank-ui/src/pages/WalletWithdrawForm.tsx
index da299b1c8..2d80bad1f 100644
--- a/packages/demobank-ui/src/pages/WalletWithdrawForm.tsx
+++ b/packages/demobank-ui/src/pages/WalletWithdrawForm.tsx
@@ -19,9 +19,9 @@ import {
   Amounts,
   HttpStatusCode,
   Logger,
+  TalerError,
   TranslatedString,
-  WithdrawUriResult,
-  parseWithdrawUri,
+  parseWithdrawUri
 } from "@gnu-taler/taler-util";
 import {
   RequestError,
@@ -31,13 +31,15 @@ import {
 } from "@gnu-taler/web-util/browser";
 import { Fragment, VNode, h } from "preact";
 import { forwardRef } from "preact/compat";
-import { useEffect, useRef, useState } from "preact/hooks";
-import { useAccessAPI } from "../hooks/access.js";
-import { buildRequestErrorMessage, undefinedIfEmpty } from "../utils.js";
-import { InputAmount, doAutoFocus } from "./PaytoWireTransferForm.js";
+import { useState } from "preact/hooks";
+import { Attention } from "../components/Attention.js";
+import { useBankCoreApiContext } from "../context/config.js";
+import { useBackendState } from "../hooks/backend.js";
 import { useSettings } from "../hooks/settings.js";
+import { buildRequestErrorMessage, undefinedIfEmpty } from "../utils.js";
+import { assertUnreachable } from "./HomePage.js";
 import { OperationState } from "./OperationState/index.js";
-import { Attention } from "../components/Attention.js";
+import { InputAmount, doAutoFocus } from "./PaytoWireTransferForm.js";
 
 const logger = new Logger("WalletWithdrawForm");
 const RefAmount = forwardRef(InputAmount);
@@ -52,7 +54,10 @@ function OldWithdrawalForm({ goToConfirmOperation, limit, onCancel, focus }: {
   const { i18n } = useTranslationContext();
   const [settings, updateSettings] = useSettings()
 
-  const { createWithdrawal } = useAccessAPI();
+  const { state: credentials } = useBackendState();
+  const creds = credentials.status !== "loggedIn" ? undefined : credentials
+
+  const { api } = useBankCoreApiContext()
   const [amountStr, setAmountStr] = useState<string | undefined>(`${settings.maxWithdrawalAmount}`);
 
   if (!!settings.currentWithdrawalOperationId) {
@@ -81,30 +86,33 @@ function OldWithdrawalForm({ goToConfirmOperation, limit, onCancel, focus }: {
   });
 
   async function doStart() {
-    if (!parsedAmount) return;
+    if (!parsedAmount || !creds) return;
     try {
-      const result = await createWithdrawal({
+      const result = await api.createWithdrawal(creds, {
         amount: Amounts.stringify(parsedAmount),
       });
-      const uri = parseWithdrawUri(result.data.taler_withdraw_uri);
-      if (!uri) {
-        return notifyError(
-          i18n.str`Server responded with an invalid  withdraw URI`,
-          i18n.str`Withdraw URI: ${result.data.taler_withdraw_uri}`);
+      if (result.type === "ok") {
+        const uri = parseWithdrawUri(result.body.taler_withdraw_uri);
+        if (!uri) {
+          return notifyError(
+            i18n.str`Server responded with an invalid  withdraw URI`,
+            i18n.str`Withdraw URI: ${result.body.taler_withdraw_uri}`);
+        } else {
+          updateSettings("currentWithdrawalOperationId", uri.withdrawalOperationId)
+          goToConfirmOperation(uri.withdrawalOperationId);
+        }
       } else {
-        updateSettings("currentWithdrawalOperationId", uri.withdrawalOperationId)
-        goToConfirmOperation(uri.withdrawalOperationId);
+        switch (result.case) {
+          case "insufficient-funds": {
+            notify({ type: "error", title: i18n.str`The operation was rejected due to insufficient funds` })
+            break;
+          }
+          default: assertUnreachable(result.case)
+        }
       }
     } catch (error) {
-      if (error instanceof RequestError) {
-        notify(
-          buildRequestErrorMessage(i18n, error.cause, {
-            onClientError: (status) =>
-              status === HttpStatusCode.Forbidden
-                ? i18n.str`The operation was rejected due to insufficient funds`
-                : undefined,
-          }),
-        );
+      if (error instanceof TalerError) {
+        notify(buildRequestErrorMessage(i18n, error))
       } else {
         notifyError(
           i18n.str`Operation failed, please report`,