1 files changed, 86 insertions, 42 deletions

diff --git a/packages/taler-wallet-webextension/src/cta/Withdraw/state.ts b/packages/taler-wallet-webextension/src/cta/Withdraw/state.ts
index da3b1eeb2..f8e27e688 100644
--- a/packages/taler-wallet-webextension/src/cta/Withdraw/state.ts
+++ b/packages/taler-wallet-webextension/src/cta/Withdraw/state.ts
@@ -185,10 +185,16 @@ export function useComponentStateFromParams({
       cancel,
       onSuccess,
       undefined,
-      chosenAmount,
-      chosenAmount.currency,
-      exchangeList,
-      exchangeByTalerUri,
+      {
+        amount: chosenAmount,
+        currency: chosenAmount.currency,
+        maxAmount: Amounts.zeroOfCurrency(chosenAmount.currency),
+        bankFee: Amounts.zeroOfCurrency(chosenAmount.currency),
+        editableAmount: true,
+        editableExchange: true,
+        exchange: exchangeByTalerUri,
+        exchangeList: exchangeList,
+      },
       setUpdatedExchangeByUser,
     );
 }
@@ -215,13 +221,7 @@ export function useComponentStateFromURI({
       WalletApiOperation.PrepareBankIntegratedWithdrawal,
       { talerWithdrawUri },
     );
-    const {
-      amount,
-      defaultExchangeBaseUrl,
-      possibleExchanges,
-      confirmTransferUrl,
-      status,
-    } = uriInfo.info;
+    const { status } = uriInfo.info;
     const txInfo = await api.wallet.call(
       WalletApiOperation.GetTransactionById,
       {
@@ -232,12 +232,8 @@ export function useComponentStateFromURI({
       talerWithdrawUri,
       status,
       transactionId: uriInfo.transactionId,
-      currency: uriInfo.info.currency,
+      bankWithdrawalInfo: uriInfo.info,
       txInfo: txInfo,
-      confirmTransferUrl,
-      amount: !amount ? undefined : Amounts.parseOrThrow(amount),
-      thisExchange: defaultExchangeBaseUrl,
-      exchanges: possibleExchanges,
     };
   });
 
@@ -277,9 +273,22 @@ export function useComponentStateFromURI({
 
   const uri = uriInfoHook.response.talerWithdrawUri;
   const txId = uriInfoHook.response.transactionId;
-  const infoAmount = uriInfoHook.response.amount;
-  const defaultExchange = uriInfoHook.response.thisExchange;
-  const exchangeList = uriInfoHook.response.exchanges;
+  const bwi = uriInfoHook.response.bankWithdrawalInfo;
+
+  const amount =
+    bwi.amount === undefined
+      ? Amounts.zeroOfCurrency(bwi.currency)
+      : Amounts.parseOrThrow(bwi.amount);
+
+  const maxAmount =
+    bwi.maxAmount === undefined
+      ? Amounts.zeroOfCurrency(bwi.currency)
+      : Amounts.parseOrThrow(bwi.maxAmount);
+
+  const bankFee =
+    bwi.wireFee === undefined
+      ? Amounts.zeroOfCurrency(bwi.currency)
+      : Amounts.parseOrThrow(bwi.wireFee);
 
   async function doManagedWithdraw(
     exchange: string,
@@ -309,7 +318,7 @@ export function useComponentStateFromURI({
     return {
       status: "already-completed",
       operationState: uriInfoHook.response.status,
-      confirmTransferUrl: uriInfoHook.response.confirmTransferUrl,
+      confirmTransferUrl: bwi.confirmTransferUrl,
       thisWallet: info.txState.major === TransactionMajorState.Pending,
       redirectToTx: () => onSuccess(info.transactionId),
       error: undefined,
@@ -322,15 +331,32 @@ export function useComponentStateFromURI({
       cancel,
       onSuccess,
       uri,
-      infoAmount,
-      uriInfoHook.response.currency,
-      exchangeList,
-      defaultExchange,
+      {
+        amount,
+        bankFee,
+        maxAmount,
+        currency: bwi.currency,
+        editableAmount: bwi.editableAmount,
+        editableExchange: bwi.editableExchange,
+        exchange: bwi.defaultExchangeBaseUrl,
+        exchangeList: bwi.possibleExchanges,
+      },
       setUpdatedExchangeByUser,
     );
   }, []);
 }
 
+type WithdrawalInfo = {
+  currency: string;
+  amount: AmountJson;
+  bankFee: AmountJson;
+  maxAmount: AmountJson;
+  editableAmount: boolean;
+  exchange: string | undefined;
+  editableExchange: boolean;
+  exchangeList: ExchangeListItem[];
+};
+
 type ManualOrManagedWithdrawFunction = (
   exchange: string,
   ageRestricted: number | undefined,
@@ -342,17 +368,14 @@ function exchangeSelectionState(
   cancel: () => Promise<void>,
   onSuccess: (txid: string) => Promise<void>,
   talerWithdrawUri: string | undefined,
-  infoAmount: AmountJson | undefined,
-  currency: string,
-  exchangeList: ExchangeListItem[],
-  exchangeSuggestedByTheBank: string | undefined,
+  wInfo: WithdrawalInfo,
   onExchangeUpdated: (ex: string) => void,
 ): RecursiveState<State> {
   const api = useBackendContext();
   const selectedExchange = useSelectedExchange({
-    currency: currency,
-    defaultExchange: exchangeSuggestedByTheBank,
-    list: exchangeList,
+    currency: wInfo.currency,
+    defaultExchange: wInfo.exchange,
+    list: wInfo.exchangeList,
   });
 
   const current =
@@ -365,9 +388,9 @@ function exchangeSelectionState(
     }
   }, [current]);
 
-  const safeAmount = !infoAmount
-    ? Amounts.zeroOfCurrency(currency)
-    : infoAmount;
+  const safeAmount = wInfo.amount
+    ? wInfo.amount
+    : Amounts.zeroOfCurrency(wInfo.currency);
   const [choosenAmount, setChoosenAmount] = useState(safeAmount);
 
   if (selectedExchange.status !== "ready") {
@@ -383,7 +406,9 @@ function exchangeSelectionState(
     const [ageRestricted, setAgeRestricted] = useState(0);
     const currentExchange = selectedExchange.selected;
 
-    const [selectedCurrency, setSelectedCurrency] = useState<string>(currency);
+    const [selectedCurrency, setSelectedCurrency] = useState<string>(
+      wInfo.currency,
+    );
     /**
      * With the exchange and amount, ask the wallet the information
      * about the withdrawal
@@ -456,6 +481,8 @@ function exchangeSelectionState(
     ).amount;
     const toBeReceived = amountHook.response.amount.effective;
 
+    const bankFee = wInfo.amount;
+
     const ageRestrictionOptions =
       amountHook.response.ageRestrictionOptions?.reduce(
         (p, c) => ({ ...p, [c]: i18n.str`under ${c}` }),
@@ -499,13 +526,26 @@ function exchangeSelectionState(
           amount: Amounts.parseOrThrow(convAccount.transferAmount!),
         };
 
+    const amountError = Amounts.isZero(choosenAmount)
+      ? i18n.str`should be greater than zero`
+      : Amounts.cmp(choosenAmount, wInfo.maxAmount) === -1
+        ? i18n.str`choose a lower value`
+        : undefined;
+
     return {
       status: "success",
       error: undefined,
-      doSelectExchange: selectedExchange.doSelect,
+      doSelectExchange: {
+        onClick: wInfo.editableExchange
+          ? selectedExchange.doSelect.onClick
+          : undefined,
+      },
+      editableAmount: wInfo.editableAmount,
+      editableExchange: wInfo.editableExchange,
       currentExchange,
       toBeReceived,
       chooseCurrencies,
+      bankFee,
       selectedCurrency,
       changeCurrency: (s) => {
         setSelectedCurrency(s);
@@ -514,16 +554,20 @@ function exchangeSelectionState(
       withdrawalFee,
       amount: {
         value: choosenAmount,
-        onInput: pushAlertOnError(async (v) => {
-          setChoosenAmount(v);
-        }),
+        onInput: wInfo.editableAmount
+          ? pushAlertOnError(async (v) => {
+              setChoosenAmount(v);
+            })
+          : undefined,
+        error: amountError,
       },
       talerWithdrawUri,
       ageRestriction,
       doWithdrawal: {
-        onClick: doingWithdraw
-          ? undefined
-          : pushAlertOnError(doWithdrawAndCheckError),
+        onClick:
+          doingWithdraw && !amountError
+            ? undefined
+            : pushAlertOnError(doWithdrawAndCheckError),
       },
       cancel,
     };