diff options
Diffstat (limited to 'packages/taler-wallet-webextension/src/pages')
6 files changed, 47 insertions, 30 deletions
diff --git a/packages/taler-wallet-webextension/src/pages/pay.tsx b/packages/taler-wallet-webextension/src/pages/pay.tsx index b5da04e31..9c6b10951 100644 --- a/packages/taler-wallet-webextension/src/pages/pay.tsx +++ b/packages/taler-wallet-webextension/src/pages/pay.tsx @@ -29,16 +29,16 @@ import * as wxApi from "../wxApi"; import React, { useState, useEffect } from "react"; +import { getJsonI18n } from "@gnu-taler/taler-wallet-core"; import { - Amounts, - AmountJson, PreparePayResult, + ConfirmPayResult, + AmountJson, PreparePayResultType, + Amounts, ContractTerms, ConfirmPayResultType, - ConfirmPayResult, - getJsonI18n, -} from "@gnu-taler/taler-wallet-core"; +} from "@gnu-taler/taler-util"; function TalerPayDialog({ talerPayUri }: { talerPayUri: string }): JSX.Element { const [payStatus, setPayStatus] = useState<PreparePayResult | undefined>(); @@ -67,7 +67,9 @@ function TalerPayDialog({ talerPayUri }: { talerPayUri: string }): JSX.Element { if (payStatus.status === PreparePayResultType.PaymentPossible) { let amountRaw = Amounts.parseOrThrow(payStatus.amountRaw); - let amountEffective: AmountJson = Amounts.parseOrThrow(payStatus.amountEffective); + let amountEffective: AmountJson = Amounts.parseOrThrow( + payStatus.amountEffective, + ); totalFees = Amounts.sub(amountEffective, amountRaw).amount; } @@ -141,13 +143,16 @@ function TalerPayDialog({ talerPayUri }: { talerPayUri: string }): JSX.Element { if (payResult.contractTerms.fulfillment_message) { const obj = { fulfillment_message: payResult.contractTerms.fulfillment_message, - fulfillment_message_i18n: payResult.contractTerms.fulfillment_message_i18n, + fulfillment_message_i18n: + payResult.contractTerms.fulfillment_message_i18n, }; - const msg = getJsonI18n(obj, "fulfillment_message") - return <div> - <p>Payment succeeded.</p> - <p>{msg}</p> - </div>; + const msg = getJsonI18n(obj, "fulfillment_message"); + return ( + <div> + <p>Payment succeeded.</p> + <p>{msg}</p> + </div> + ); } else { return <span>Redirecting ...</span>; } diff --git a/packages/taler-wallet-webextension/src/pages/popup.tsx b/packages/taler-wallet-webextension/src/pages/popup.tsx index 9071e46fd..4d12d9a83 100644 --- a/packages/taler-wallet-webextension/src/pages/popup.tsx +++ b/packages/taler-wallet-webextension/src/pages/popup.tsx @@ -38,7 +38,8 @@ import { TransactionType, AmountString, Timestamp, -} from "@gnu-taler/taler-wallet-core"; + amountFractionalBase, +} from "@gnu-taler/taler-util"; import { abbrev, renderAmount, PageLink } from "../renderHtml"; import * as wxApi from "../wxApi"; @@ -160,7 +161,7 @@ class WalletNavBar extends React.Component<any, any> { * Render an amount as a large number with a small currency symbol. */ function bigAmount(amount: AmountJson): JSX.Element { - const v = amount.value + amount.fraction / Amounts.fractionalBase; + const v = amount.value + amount.fraction / amountFractionalBase; return ( <span> <span style={{ fontSize: "5em", display: "block" }}>{v}</span>{" "} diff --git a/packages/taler-wallet-webextension/src/pages/refund.tsx b/packages/taler-wallet-webextension/src/pages/refund.tsx index 572aba8ed..bfeec0aa3 100644 --- a/packages/taler-wallet-webextension/src/pages/refund.tsx +++ b/packages/taler-wallet-webextension/src/pages/refund.tsx @@ -23,7 +23,11 @@ import React, { useEffect, useState } from "react"; import * as wxApi from "../wxApi"; import { AmountView } from "../renderHtml"; -import { PurchaseDetails, ApplyRefundResponse, Amounts } from "@gnu-taler/taler-wallet-core"; +import { + PurchaseDetails, + ApplyRefundResponse, + Amounts, +} from "@gnu-taler/taler-util"; function RefundStatusView(props: { talerRefundUri: string }): JSX.Element { const [applyResult, setApplyResult] = useState<ApplyRefundResponse>(); @@ -57,15 +61,20 @@ function RefundStatusView(props: { talerRefundUri: string }): JSX.Element { <> <h2>Refund Status</h2> <p> - The product <em>{applyResult.info.summary}</em> has - received a total effective refund of{" "} + The product <em>{applyResult.info.summary}</em> has received a total + effective refund of{" "} <AmountView amount={applyResult.amountRefundGranted} />. </p> - {applyResult.pendingAtExchange ? <p>Refund processing is still in progress.</p> : null} - {!Amounts.isZero(applyResult.amountRefundGone) ? <p> - The refund amount of <AmountView amount={applyResult.amountRefundGone} /> - could not be applied. - </p> : null} + {applyResult.pendingAtExchange ? ( + <p>Refund processing is still in progress.</p> + ) : null} + {!Amounts.isZero(applyResult.amountRefundGone) ? ( + <p> + The refund amount of{" "} + <AmountView amount={applyResult.amountRefundGone} /> + could not be applied. + </p> + ) : null} </> ); } diff --git a/packages/taler-wallet-webextension/src/pages/tip.tsx b/packages/taler-wallet-webextension/src/pages/tip.tsx index 29c07cfe9..b1ac27228 100644 --- a/packages/taler-wallet-webextension/src/pages/tip.tsx +++ b/packages/taler-wallet-webextension/src/pages/tip.tsx @@ -22,7 +22,7 @@ import * as React from "react"; import { useEffect, useState } from "react"; -import { PrepareTipResult } from "@gnu-taler/taler-wallet-core"; +import { PrepareTipResult } from "@gnu-taler/taler-util"; import { AmountView } from "../renderHtml"; import * as wxApi from "../wxApi"; @@ -65,8 +65,8 @@ function TalerTipDialog({ talerTipUri }: { talerTipUri: string }): JSX.Element { if (prepareTipResult.accepted) { return ( <span> - Tip from <code>{prepareTipResult.merchantBaseUrl}</code> accepted. - Check your transactions list for more details. + Tip from <code>{prepareTipResult.merchantBaseUrl}</code> accepted. Check + your transactions list for more details. </span> ); } else { @@ -75,8 +75,10 @@ function TalerTipDialog({ talerTipUri }: { talerTipUri: string }): JSX.Element { <p> The merchant <code>{prepareTipResult.merchantBaseUrl}</code> is offering you a tip of{" "} - <strong><AmountView amount={prepareTipResult.tipAmountEffective} /></strong> via the - exchange <code>{prepareTipResult.exchangeBaseUrl}</code> + <strong> + <AmountView amount={prepareTipResult.tipAmountEffective} /> + </strong>{" "} + via the exchange <code>{prepareTipResult.exchangeBaseUrl}</code> </p> <button onClick={doAccept}>Accept tip</button> <button onClick={doIgnore}>Ignore</button> diff --git a/packages/taler-wallet-webextension/src/pages/welcome.tsx b/packages/taler-wallet-webextension/src/pages/welcome.tsx index fb4af573d..dd10ac13c 100644 --- a/packages/taler-wallet-webextension/src/pages/welcome.tsx +++ b/packages/taler-wallet-webextension/src/pages/welcome.tsx @@ -26,7 +26,7 @@ import { PageLink } from "../renderHtml"; import * as wxApi from "../wxApi"; import { getPermissionsApi } from "../compat"; import { extendedPermissions } from "../permissions"; -import { WalletDiagnostics } from "@gnu-taler/taler-wallet-core"; +import { WalletDiagnostics } from "@gnu-taler/taler-util"; function Diagnostics(): JSX.Element | null { const [timedOut, setTimedOut] = useState(false); diff --git a/packages/taler-wallet-webextension/src/pages/withdraw.tsx b/packages/taler-wallet-webextension/src/pages/withdraw.tsx index 02758fd93..c4a02817c 100644 --- a/packages/taler-wallet-webextension/src/pages/withdraw.tsx +++ b/packages/taler-wallet-webextension/src/pages/withdraw.tsx @@ -23,7 +23,7 @@ import * as i18n from "../i18n"; -import { WithdrawDetailView, renderAmount } from "../renderHtml"; +import { renderAmount } from "../renderHtml"; import React, { useState, useEffect } from "react"; import { @@ -31,7 +31,7 @@ import { onUpdateNotification, getWithdrawalDetailsForUri, } from "../wxApi"; -import { WithdrawUriInfoResponse } from "@gnu-taler/taler-wallet-core"; +import { WithdrawUriInfoResponse } from "@gnu-taler/taler-util"; function WithdrawalDialog(props: { talerWithdrawUri: string }): JSX.Element { const [details, setDetails] = useState<WithdrawUriInfoResponse | undefined>(); |