diff options
author | Florian Dold <florian@dold.me> | 2021-01-17 18:33:25 +0100 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2021-01-17 18:33:25 +0100 |
commit | b1056b4c20bca2cddfcb50fa93eeef0b183b38ea (patch) | |
tree | fd49bf1c0c6fe47b1d0380c70e341cb6829704da /packages/taler-wallet-webextension/src/pages/pay.tsx | |
parent | 9aa9742d0e909609f9ce22bc1db8364ab7076db8 (diff) | |
download | wallet-core-b1056b4c20bca2cddfcb50fa93eeef0b183b38ea.tar.xz |
actually display fees instead of effective amount
Diffstat (limited to 'packages/taler-wallet-webextension/src/pages/pay.tsx')
-rw-r--r-- | packages/taler-wallet-webextension/src/pages/pay.tsx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/taler-wallet-webextension/src/pages/pay.tsx b/packages/taler-wallet-webextension/src/pages/pay.tsx index fcf50cf37..ce3a59674 100644 --- a/packages/taler-wallet-webextension/src/pages/pay.tsx +++ b/packages/taler-wallet-webextension/src/pages/pay.tsx @@ -35,7 +35,6 @@ import { PreparePayResult, PreparePayResultType, ContractTerms, - codecForContractTerms, ConfirmPayResultType, ConfirmPayResult, getJsonI18n, @@ -47,7 +46,7 @@ function TalerPayDialog({ talerPayUri }: { talerPayUri: string }): JSX.Element { const [payErrMsg, setPayErrMsg] = useState<string | undefined>(""); const [numTries, setNumTries] = useState(0); const [loading, setLoading] = useState(false); - let amountEffective: AmountJson | undefined = undefined; + let totalFees: AmountJson | undefined = undefined; useEffect(() => { const doFetch = async (): Promise<void> => { @@ -67,7 +66,9 @@ function TalerPayDialog({ talerPayUri }: { talerPayUri: string }): JSX.Element { } if (payStatus.status === PreparePayResultType.PaymentPossible) { - amountEffective = Amounts.parseOrThrow(payStatus.amountEffective); + let amountRaw = Amounts.parseOrThrow(payStatus.amountRaw); + let amountEffective: AmountJson = Amounts.parseOrThrow(payStatus.amountEffective); + totalFees = Amounts.sub(amountEffective, amountRaw).amount; } if ( @@ -161,10 +162,10 @@ function TalerPayDialog({ talerPayUri }: { talerPayUri: string }): JSX.Element { <div style={{ textAlign: "center" }}> <strong>{contractTerms.summary}</strong> </div> - {amountEffective ? ( + {totalFees ? ( <i18n.Translate wrap="p"> The total price is <span>{amount} </span> - (plus <span>{renderAmount(amountEffective)}</span> fees). + (plus <span>{renderAmount(totalFees)}</span> fees). </i18n.Translate> ) : ( <i18n.Translate wrap="p"> |