From 044b7236572089b98a9f230499bb4cd9ad0342a3 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 1 Sep 2020 20:37:50 +0530 Subject: correct refund amounts and better testing --- packages/taler-wallet-core/src/util/amounts.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'packages/taler-wallet-core/src/util') diff --git a/packages/taler-wallet-core/src/util/amounts.ts b/packages/taler-wallet-core/src/util/amounts.ts index 2a8c47905..2f912cff4 100644 --- a/packages/taler-wallet-core/src/util/amounts.ts +++ b/packages/taler-wallet-core/src/util/amounts.ts @@ -101,11 +101,21 @@ export function getZero(currency: string): AmountJson { }; } -export function sum(amounts: AmountJson[]): Result { +export type AmountLike = AmountString | AmountJson; + +export function jsonifyAmount(amt: AmountLike): AmountJson { + if (typeof amt === "string") { + return parseOrThrow(amt); + } + return amt; +} + +export function sum(amounts: AmountLike[]): Result { if (amounts.length <= 0) { throw Error("can't sum zero amounts"); } - return add(amounts[0], ...amounts.slice(1)); + const jsonAmounts = amounts.map((x) => jsonifyAmount(x)); + return add(jsonAmounts[0], ...jsonAmounts.slice(1)); } /** -- cgit v1.2.3