From d50294f76e0aa357d690a933bb6d696a2f6aef1b Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 2 Nov 2022 17:42:14 +0100 Subject: wallet-core: DB FIXMEs (amount format) --- packages/taler-wallet-webextension/src/wallet/DepositPage/state.ts | 6 +++--- .../taler-wallet-webextension/src/wallet/DepositPage/stories.tsx | 6 +++--- packages/taler-wallet-webextension/src/wallet/Transaction.tsx | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'packages/taler-wallet-webextension/src/wallet') diff --git a/packages/taler-wallet-webextension/src/wallet/DepositPage/state.ts b/packages/taler-wallet-webextension/src/wallet/DepositPage/state.ts index a70682d89..2693db79e 100644 --- a/packages/taler-wallet-webextension/src/wallet/DepositPage/state.ts +++ b/packages/taler-wallet-webextension/src/wallet/DepositPage/state.ts @@ -99,7 +99,7 @@ export function useComponentState( const balance = bs.length > 0 ? Amounts.parseOrThrow(bs[0].available) - : Amounts.getZero(currency); + : Amounts.zeroOfCurrency(currency); if (Amounts.isZero(balance)) { return { @@ -157,12 +157,12 @@ export function useComponentState( const totalFee = fee !== undefined ? Amounts.sum([fee.wire, fee.coin, fee.refresh]).amount - : Amounts.getZero(currency); + : Amounts.zeroOfCurrency(currency); const totalToDeposit = parsedAmount && fee !== undefined ? Amounts.sub(parsedAmount, totalFee).amount - : Amounts.getZero(currency); + : Amounts.zeroOfCurrency(currency); const isDirty = amount !== initialValue; const amountError = !isDirty diff --git a/packages/taler-wallet-webextension/src/wallet/DepositPage/stories.tsx b/packages/taler-wallet-webextension/src/wallet/DepositPage/stories.tsx index 64b2c91a7..af9c620cb 100644 --- a/packages/taler-wallet-webextension/src/wallet/DepositPage/stories.tsx +++ b/packages/taler-wallet-webextension/src/wallet/DepositPage/stories.tsx @@ -76,7 +76,7 @@ export const WithNoAccountForIBAN = createExample(ReadyView, { return; }, }, - totalFee: Amounts.getZero("USD"), + totalFee: Amounts.zeroOfCurrency("USD"), totalToDeposit: Amounts.parseOrThrow("USD:10"), // onCalculateFee: alwaysReturnFeeToOne, }); @@ -111,7 +111,7 @@ export const WithIBANAccountTypeSelected = createExample(ReadyView, { return; }, }, - totalFee: Amounts.getZero("USD"), + totalFee: Amounts.zeroOfCurrency("USD"), totalToDeposit: Amounts.parseOrThrow("USD:10"), // onCalculateFee: alwaysReturnFeeToOne, }); @@ -146,7 +146,7 @@ export const NewBitcoinAccountTypeSelected = createExample(ReadyView, { return; }, }, - totalFee: Amounts.getZero("USD"), + totalFee: Amounts.zeroOfCurrency("USD"), totalToDeposit: Amounts.parseOrThrow("USD:10"), // onCalculateFee: alwaysReturnFeeToOne, }); diff --git a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx index d7b6e3b1c..9fff76442 100644 --- a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx @@ -1132,7 +1132,7 @@ export function PurchaseDetails({ const partialFee = Amounts.sub(price.effective, price.raw).amount; const refundFee = !refund - ? Amounts.getZero(price.effective.currency) + ? Amounts.zeroOfCurrency(price.effective.currency) : Amounts.sub(refund.raw, refund.effective).amount; const fee = Amounts.sum([partialFee, refundFee]).amount; -- cgit v1.2.3