Merge branch 'master' into age-withdraw

1 files changed, 6 insertions, 25 deletions

diff --git a/packages/taler-wallet-core/src/operations/balance.ts b/packages/taler-wallet-core/src/operations/balance.ts
index 0fcab0542..a20ded2af 100644
--- a/packages/taler-wallet-core/src/operations/balance.ts
+++ b/packages/taler-wallet-core/src/operations/balance.ts
@@ -95,14 +95,7 @@ function computeRefreshGroupAvailableAmount(r: RefreshGroupRecord): AmountJson {
     return available;
   }
   for (let i = 0; i < r.oldCoinPubs.length; i++) {
-    const session = r.refreshSessionPerCoin[i];
-    if (session) {
-      // We are always assuming the refresh will succeed, thus we
-      // report the output as available balance.
-      available = Amounts.add(available, session.amountRefreshOutput).amount;
-    } else {
-      available = Amounts.add(available, r.estimatedOutputPerCoin[i]).amount;
-    }
+    available = Amounts.add(available, r.expectedOutputPerCoin[i]).amount;
   }
   return available;
 }
@@ -140,11 +133,7 @@ export async function getBalancesInsideTransaction(
     const b = initBalance(ca.currency);
     const count = ca.visibleCoinCount ?? 0;
     for (let i = 0; i < count; i++) {
-      b.available = Amounts.add(b.available, {
-        currency: ca.currency,
-        fraction: ca.amountFrac,
-        value: ca.amountVal,
-      }).amount;
+      b.available = Amounts.add(b.available, ca.value).amount;
     }
   });
 
@@ -163,7 +152,7 @@ export async function getBalancesInsideTransaction(
       case WithdrawalGroupStatus.AbortedExchange:
       case WithdrawalGroupStatus.FailedAbortingBank:
       case WithdrawalGroupStatus.FailedBankAborted:
-      case WithdrawalGroupStatus.Finished:
+      case WithdrawalGroupStatus.Done:
         // Does not count as pendingIncoming
         return;
       case WithdrawalGroupStatus.PendingReady:
@@ -281,7 +270,7 @@ export async function getAcceptableExchangeBaseUrls(
   const acceptableExchangeUrls = new Set<string>();
   const depositableExchangeUrls = new Set<string>();
   await ws.db
-    .mktx((x) => [x.exchanges, x.exchangeDetails, x.auditorTrust])
+    .mktx((x) => [x.exchanges, x.exchangeDetails])
     .runReadOnly(async (tx) => {
       // FIXME: We should have a DB index to look up all exchanges
       // for a particular auditor ...
@@ -415,11 +404,7 @@ export async function getMerchantPaymentBalanceDetails(
         if (ca.currency != req.currency) {
           return;
         }
-        const singleCoinAmount: AmountJson = {
-          currency: ca.currency,
-          fraction: ca.amountFrac,
-          value: ca.amountVal,
-        };
+        const singleCoinAmount: AmountJson = Amounts.parseOrThrow(ca.value);
         const coinAmount: AmountJson = Amounts.mult(
           singleCoinAmount,
           ca.freshCoinCount,
@@ -537,11 +522,7 @@ export async function getPeerPaymentBalanceDetailsInTx(
     ) {
       return;
     }
-    const singleCoinAmount: AmountJson = {
-      currency: ca.currency,
-      fraction: ca.amountFrac,
-      value: ca.amountVal,
-    };
+    const singleCoinAmount: AmountJson = Amounts.parseOrThrow(ca.value);
     const coinAmount: AmountJson = Amounts.mult(
       singleCoinAmount,
       ca.freshCoinCount,