1 files changed, 77 insertions, 46 deletions
diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts b/packages/taler-wallet-core/src/operations/withdraw.ts
index 63c811e60..b9ba3058f 100644
--- a/packages/taler-wallet-core/src/operations/withdraw.ts
+++ b/packages/taler-wallet-core/src/operations/withdraw.ts
@@ -35,6 +35,7 @@ import {
   Duration,
   ExchangeBatchWithdrawRequest,
   ExchangeListItem,
+  ExchangeWireAccount,
   ExchangeWithdrawBatchResponse,
   ExchangeWithdrawRequest,
   ExchangeWithdrawResponse,
@@ -2584,6 +2585,76 @@ export async function acceptWithdrawalFromUri(
   };
 }
 
+async function fetchAccount(
+  ws: InternalWalletState,
+  instructedAmount: AmountJson,
+  acct: ExchangeWireAccount,
+  reservePub?: string,
+): Promise<WithdrawalExchangeAccountDetails> {
+  let paytoUri: string;
+  let transferAmount: AmountString | undefined = undefined;
+  let currencySpecification: CurrencySpecification | undefined = undefined;
+  if (acct.conversion_url != null) {
+    const reqUrl = new URL("cashin-rate", acct.conversion_url);
+    reqUrl.searchParams.set(
+      "amount_credit",
+      Amounts.stringify(instructedAmount),
+    );
+    const httpResp = await ws.http.fetch(reqUrl.href);
+    const respOrErr = await readSuccessResponseJsonOrErrorCode(
+      httpResp,
+      codecForCashinConversionResponse(),
+    );
+    if (respOrErr.isError) {
+      return {
+        status: "error",
+        paytoUri: acct.payto_uri,
+        conversionError: respOrErr.talerErrorResponse,
+      };
+    }
+    const resp = respOrErr.response;
+    paytoUri = acct.payto_uri;
+    transferAmount = resp.amount_debit;
+    const configUrl = new URL("config", acct.conversion_url);
+    const configResp = await ws.http.fetch(configUrl.href);
+    const configRespOrError = await readSuccessResponseJsonOrErrorCode(
+      configResp,
+      codecForConversionBankConfig(),
+    );
+    if (configRespOrError.isError) {
+      return {
+        status: "error",
+        paytoUri: acct.payto_uri,
+        conversionError: configRespOrError.talerErrorResponse,
+      };
+    }
+    const configParsed = configRespOrError.response;
+    currencySpecification = configParsed.fiat_currency_specification;
+  } else {
+    paytoUri = acct.payto_uri;
+    transferAmount = Amounts.stringify(instructedAmount);
+  }
+  paytoUri = addPaytoQueryParams(paytoUri, {
+    amount: Amounts.stringify(transferAmount),
+  });
+  if (reservePub != null) {
+    paytoUri = addPaytoQueryParams(paytoUri, {
+      message: `Taler Withdrawal ${reservePub}`,
+    });
+  }
+  const acctInfo: WithdrawalExchangeAccountDetails = {
+    status: "ok",
+    paytoUri,
+    transferAmount,
+    currencySpecification,
+    creditRestrictions: acct.credit_restrictions,
+  };
+  if (transferAmount != null) {
+    acctInfo.transferAmount = transferAmount;
+  }
+  return acctInfo;
+}
+
 /**
  * Gather information about bank accounts that can be used for
  * withdrawals.  This includes accounts that are in a different
@@ -2600,52 +2671,12 @@ async function fetchWithdrawalAccountInfo(
   const { exchangeDetails, instructedAmount } = req;
   const withdrawalAccounts: WithdrawalExchangeAccountDetails[] = [];
   for (let acct of exchangeDetails.wireInfo.accounts) {
-    let paytoUri: string;
-    let transferAmount: AmountString | undefined = undefined;
-    let currencySpecification: CurrencySpecification | undefined = undefined;
-    if (acct.conversion_url != null) {
-      const reqUrl = new URL("cashin-rate", acct.conversion_url);
-      reqUrl.searchParams.set(
-        "amount_credit",
-        Amounts.stringify(instructedAmount),
-      );
-      const httpResp = await ws.http.fetch(reqUrl.href);
-      const resp = await readSuccessResponseJsonOrThrow(
-        httpResp,
-        codecForCashinConversionResponse(),
-      );
-      paytoUri = acct.payto_uri;
-      transferAmount = resp.amount_debit;
-      const configUrl = new URL("config", acct.conversion_url);
-      const configResp = await ws.http.fetch(configUrl.href);
-      const configParsed = await readSuccessResponseJsonOrThrow(
-        configResp,
-        codecForConversionBankConfig(),
-      );
-      currencySpecification = configParsed.fiat_currency_specification;
-      if (req.reservePub) {
-      }
-    } else {
-      paytoUri = acct.payto_uri;
-      transferAmount = Amounts.stringify(instructedAmount);
-    }
-    paytoUri = addPaytoQueryParams(paytoUri, {
-      amount: Amounts.stringify(transferAmount),
-    });
-    if (req.reservePub != null) {
-      paytoUri = addPaytoQueryParams(paytoUri, {
-        message: `Taler Withdrawal ${req.reservePub}`,
-      });
-    }
-    const acctInfo: WithdrawalExchangeAccountDetails = {
-      paytoUri,
-      transferAmount,
-      currencySpecification,
-      creditRestrictions: acct.credit_restrictions,
-    };
-    if (transferAmount != null) {
-      acctInfo.transferAmount = transferAmount;
-    }
+    const acctInfo = await fetchAccount(
+      ws,
+      req.instructedAmount,
+      acct,
+      req.reservePub,
+    );
     withdrawalAccounts.push(acctInfo);
   }
   return withdrawalAccounts;