1 files changed, 75 insertions, 8 deletions

diff --git a/packages/taler-wallet-webextension/src/cta/Withdraw/state.ts b/packages/taler-wallet-webextension/src/cta/Withdraw/state.ts
index f19f32ec0..46a72ac87 100644
--- a/packages/taler-wallet-webextension/src/cta/Withdraw/state.ts
+++ b/packages/taler-wallet-webextension/src/cta/Withdraw/state.ts
@@ -26,7 +26,7 @@ import {
   stringifyWithdrawUri,
 } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
-import { useState } from "preact/hooks";
+import { useEffect, useState } from "preact/hooks";
 import { alertFromError, useAlertContext } from "../../context/alert.js";
 import { useBackendContext } from "../../context/backend.js";
 import { useTranslationContext } from "@gnu-taler/web-util/browser";
@@ -39,16 +39,20 @@ export function useComponentStateFromParams({
   talerExchangeWithdrawUri: maybeTalerUri,
   amount,
   cancel,
+  onAmountChanged,
   onSuccess,
 }: PropsFromParams): RecursiveState<State> {
   const api = useBackendContext();
   const { i18n } = useTranslationContext();
+  const paramsAmount = amount ? Amounts.parse(amount) : undefined;
   const uriInfoHook = useAsyncAsHook(async () => {
     const exchanges = await api.wallet.call(
       WalletApiOperation.ListExchanges,
       {},
     );
-    const uri = parseWithdrawExchangeUri(maybeTalerUri);
+    const uri = maybeTalerUri
+      ? parseWithdrawExchangeUri(maybeTalerUri)
+      : undefined;
     const exchangeByTalerUri = uri?.exchangeBaseUrl;
     let ex: ExchangeFullDetails | undefined;
     if (exchangeByTalerUri && uri.exchangePub) {
@@ -65,11 +69,8 @@ export function useComponentStateFromParams({
 
       ex = info.exchange;
     }
-    const chosenAmount = uri
-      ? uri.amount
-        ? Amounts.parseOrThrow(uri.amount)
-        : Amounts.parseOrThrow(`${ex ? ex.currency : "KUDOS"}:66`)
-      : Amounts.parseOrThrow(amount);
+    const chosenAmount =
+      !uri || !uri.amount ? undefined : Amounts.parse(uri.amount);
     return { amount: chosenAmount, exchanges, exchange: ex };
   });
 
@@ -85,10 +86,76 @@ export function useComponentStateFromParams({
     };
   }
 
-  const chosenAmount = uriInfoHook.response.amount;
+  useEffect(() => {
+    uriInfoHook?.retry();
+  }, [amount]);
+
   const exchangeByTalerUri = uriInfoHook.response.exchange?.exchangeBaseUrl;
   const exchangeList = uriInfoHook.response.exchanges.exchanges;
 
+  const maybeAmount = uriInfoHook.response.amount ?? paramsAmount;
+
+  if (!maybeAmount) {
+    const exchangeBaseUrl =
+      uriInfoHook.response.exchange?.exchangeBaseUrl ??
+      (exchangeList.length > 0 ? exchangeList[0].exchangeBaseUrl : undefined);
+    const currency =
+      uriInfoHook.response.exchange?.currency ??
+      (exchangeList.length > 0 ? exchangeList[0].currency : undefined);
+
+    if (!exchangeBaseUrl) {
+      return {
+        status: "error",
+        error: {
+          message: i18n.str`Can't withdraw from exchange`,
+          description: i18n.str`Missing base URL`,
+          cause: undefined,
+          context: {},
+          type: "error",
+        },
+      };
+    }
+    if (!currency) {
+      return {
+        status: "error",
+        error: {
+          message: i18n.str`Can't withdraw from exchange`,
+          description: i18n.str`Missing unknown currency`,
+          cause: undefined,
+          context: {},
+          type: "error",
+        },
+      };
+    }
+    return () => {
+      const { pushAlertOnError } = useAlertContext();
+      const [amount, setAmount] = useState<AmountJson>(
+        Amounts.zeroOfCurrency(currency),
+      );
+      const isValid = Amounts.isNonZero(amount);
+      return {
+        status: "select-amount",
+        currency,
+        exchangeBaseUrl,
+        error: undefined,
+        confirm: {
+          onClick: isValid
+            ? pushAlertOnError(async () => {
+                onAmountChanged(Amounts.stringify(amount));
+              })
+            : undefined,
+        },
+        amount: {
+          value: amount,
+          onInput: pushAlertOnError(async (e) => {
+            setAmount(e);
+          }),
+        },
+      };
+    };
+  }
+  const chosenAmount = maybeAmount;
+
   async function doManualWithdraw(
     exchange: string,
     ageRestricted: number | undefined,