1 files changed, 68 insertions, 9 deletions

diff --git a/packages/taler-wallet-webextension/src/cta/TransferCreate/state.ts b/packages/taler-wallet-webextension/src/cta/TransferCreate/state.ts
index b229924b2..089f46047 100644
--- a/packages/taler-wallet-webextension/src/cta/TransferCreate/state.ts
+++ b/packages/taler-wallet-webextension/src/cta/TransferCreate/state.ts
@@ -14,9 +14,11 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
-import { Amounts, TalerErrorDetail } from "@gnu-taler/taler-util";
+import { Amounts, TalerErrorDetail, TalerProtocolTimestamp } from "@gnu-taler/taler-util";
 import { TalerError, WalletApiOperation } from "@gnu-taler/taler-wallet-core";
+import { format, isFuture, parse } from "date-fns";
 import { useState } from "preact/hooks";
+import { useAsyncAsHook } from "../../hooks/useAsyncAsHook.js";
 import { wxApi } from "../../wxApi.js";
 import { Props, State } from "./index.js";
 
@@ -26,17 +28,65 @@ export function useComponentState(
 ): State {
   const amount = Amounts.parseOrThrow(amountStr);
 
-  const [subject, setSubject] = useState("");
+  const [subject, setSubject] = useState<string | undefined>();
+  const [timestamp, setTimestamp] = useState<string | undefined>()
+
   const [operationError, setOperationError] = useState<
     TalerErrorDetail | undefined
   >(undefined);
 
+
+  const hook = useAsyncAsHook(async () => {
+    const resp = await api.wallet.call(WalletApiOperation.PreparePeerPushPayment, {
+      amount: amountStr
+    })
+    return resp
+  })
+
+  if (!hook) {
+    return {
+      status: "loading",
+      error: undefined
+    }
+  }
+  if (hook.hasError) {
+    return {
+      status: "loading-uri",
+      error: hook
+    }
+  }
+
+  const { amountEffective, amountRaw } = hook.response
+  const debitAmount = Amounts.parseOrThrow(amountRaw)
+  const toBeReceived = Amounts.parseOrThrow(amountEffective)
+
+  let purse_expiration: TalerProtocolTimestamp | undefined = undefined
+  let timestampError: string | undefined = undefined;
+
+  const t = timestamp === undefined ? undefined : parse(timestamp, "dd/MM/yyyy", new Date())
+
+  if (t !== undefined) {
+    if (Number.isNaN(t.getTime())) {
+      timestampError = 'Should have the format "dd/MM/yyyy"'
+    } else {
+      if (!isFuture(t)) {
+        timestampError = 'Should be in the future'
+      } else {
+        purse_expiration = {
+          t_s: t.getTime() / 1000
+        }
+      }
+    }
+  }
+
   async function accept(): Promise<void> {
+    if (!subject || !purse_expiration) return;
     try {
       const resp = await api.wallet.call(WalletApiOperation.InitiatePeerPushPayment, {
-        amount: Amounts.stringify(amount),
         partialContractTerms: {
           summary: subject,
+          amount: amountStr,
+          purse_expiration
         },
       });
       onSuccess(resp.transactionId);
@@ -48,22 +98,31 @@ export function useComponentState(
       throw Error("error trying to accept");
     }
   }
+
+  const unableToCreate = !subject || Amounts.isZero(amount) || !purse_expiration
+
   return {
     status: "ready",
-    invalid: !subject || Amounts.isZero(amount),
     cancel: {
       onClick: onClose,
     },
     subject: {
-      error: !subject ? "cant be empty" : undefined,
-      value: subject,
+      error: subject === undefined ? undefined : !subject ? "Can't be empty" : undefined,
+      value: subject ?? "",
       onInput: async (e) => setSubject(e),
     },
+    expiration: {
+      error: timestampError,
+      value: timestamp === undefined ? "" : timestamp,
+      onInput: async (e) => {
+        setTimestamp(e)
+      }
+    },
     create: {
-      onClick: accept,
+      onClick: unableToCreate ? undefined : accept,
     },
-    chosenAmount: amount,
-    toBeReceived: amount,
+    debitAmount,
+    toBeReceived,
     error: undefined,
     operationError,
   };