diff --git a/src/i18n/de.po b/src/i18n/de.po index 52f7c82e2..cafa23d4e 100644 --- a/src/i18n/de.po +++ b/src/i18n/de.po @@ -285,42 +285,42 @@ msgstr "Bezahlung bestätigen" msgid "Cancel" msgstr "Saldo" -#: src/webex/renderHtml.tsx:209 +#: src/webex/renderHtml.tsx:212 #, fuzzy, c-format msgid "Withdrawal fees:" msgstr "Abheben bei" -#: src/webex/renderHtml.tsx:210 +#: src/webex/renderHtml.tsx:213 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:211 +#: src/webex/renderHtml.tsx:214 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:216 +#: src/webex/renderHtml.tsx:220 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:217 +#: src/webex/renderHtml.tsx:221 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:218 +#: src/webex/renderHtml.tsx:222 #, fuzzy, c-format msgid "Withdraw Fee" msgstr "Abheben bei %1$s" -#: src/webex/renderHtml.tsx:219 +#: src/webex/renderHtml.tsx:223 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:220 +#: src/webex/renderHtml.tsx:224 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po index 6ceaf22aa..559b8f8c5 100644 --- a/src/i18n/en-US.po +++ b/src/i18n/en-US.po @@ -282,42 +282,42 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/webex/renderHtml.tsx:209 +#: src/webex/renderHtml.tsx:212 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/renderHtml.tsx:210 +#: src/webex/renderHtml.tsx:213 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:211 +#: src/webex/renderHtml.tsx:214 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:216 +#: src/webex/renderHtml.tsx:220 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:217 +#: src/webex/renderHtml.tsx:221 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:218 +#: src/webex/renderHtml.tsx:222 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/renderHtml.tsx:219 +#: src/webex/renderHtml.tsx:223 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:220 +#: src/webex/renderHtml.tsx:224 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/i18n/fr.po b/src/i18n/fr.po index 41c6e6d6e..6e31237da 100644 --- a/src/i18n/fr.po +++ b/src/i18n/fr.po @@ -282,42 +282,42 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/webex/renderHtml.tsx:209 +#: src/webex/renderHtml.tsx:212 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/renderHtml.tsx:210 +#: src/webex/renderHtml.tsx:213 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:211 +#: src/webex/renderHtml.tsx:214 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:216 +#: src/webex/renderHtml.tsx:220 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:217 +#: src/webex/renderHtml.tsx:221 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:218 +#: src/webex/renderHtml.tsx:222 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/renderHtml.tsx:219 +#: src/webex/renderHtml.tsx:223 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:220 +#: src/webex/renderHtml.tsx:224 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/i18n/it.po b/src/i18n/it.po index 41c6e6d6e..6e31237da 100644 --- a/src/i18n/it.po +++ b/src/i18n/it.po @@ -282,42 +282,42 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/webex/renderHtml.tsx:209 +#: src/webex/renderHtml.tsx:212 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/renderHtml.tsx:210 +#: src/webex/renderHtml.tsx:213 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:211 +#: src/webex/renderHtml.tsx:214 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:216 +#: src/webex/renderHtml.tsx:220 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:217 +#: src/webex/renderHtml.tsx:221 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:218 +#: src/webex/renderHtml.tsx:222 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/renderHtml.tsx:219 +#: src/webex/renderHtml.tsx:223 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:220 +#: src/webex/renderHtml.tsx:224 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts index 737458c48..e2bd80a80 100644 --- a/src/i18n/strings.ts +++ b/src/i18n/strings.ts @@ -163,7 +163,7 @@ strings['de'] = { "Saldo" ], "Withdrawal fees:": [ - "Abheben bei %1$s" + "Abheben bei" ], "Rounding loss:": [ "" diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot index 41c6e6d6e..6e31237da 100644 --- a/src/i18n/taler-wallet-webex.pot +++ b/src/i18n/taler-wallet-webex.pot @@ -282,42 +282,42 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/webex/renderHtml.tsx:209 +#: src/webex/renderHtml.tsx:212 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/renderHtml.tsx:210 +#: src/webex/renderHtml.tsx:213 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:211 +#: src/webex/renderHtml.tsx:214 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:216 +#: src/webex/renderHtml.tsx:220 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:217 +#: src/webex/renderHtml.tsx:221 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:218 +#: src/webex/renderHtml.tsx:222 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/renderHtml.tsx:219 +#: src/webex/renderHtml.tsx:223 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:220 +#: src/webex/renderHtml.tsx:224 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/webex/pages/tree.tsx b/src/webex/pages/tree.tsx index 072150312..c8035c597 100644 --- a/src/webex/pages/tree.tsx +++ b/src/webex/pages/tree.tsx @@ -42,7 +42,7 @@ import { refresh, } from "../wxApi"; -import { renderAmount } from "../renderHtml"; +import { ExpanderText, renderAmount } from "../renderHtml"; import * as React from "react"; import * as ReactDOM from "react-dom"; @@ -244,49 +244,6 @@ interface DenominationListProps { exchange: ExchangeRecord; } -interface ExpanderTextProps { - text: string; -} - -class ExpanderText extends ImplicitStateComponent { - private expanded = this.makeState(false); - private textArea: any = undefined; - - componentDidUpdate() { - if (this.expanded() && this.textArea) { - this.textArea.focus(); - this.textArea.scrollTop = 0; - } - } - - render(): JSX.Element { - if (!this.expanded()) { - return ( - { this.expanded(true); }}> - {(this.props.text.length <= 10) - ? this.props.text - : ( - - {this.props.text.substring(0, 10)} - ... - - ) - } - - ); - } - return ( - - ); - } -} - class DenominationList extends ImplicitStateComponent { private expanded = this.makeState(false); private denoms = this.makeState(undefined); diff --git a/src/webex/renderHtml.tsx b/src/webex/renderHtml.tsx index d4c536fa9..d225cef0c 100644 --- a/src/webex/renderHtml.tsx +++ b/src/webex/renderHtml.tsx @@ -31,6 +31,8 @@ import { ReserveCreationInfo, } from "../types"; +import { ImplicitStateComponent } from "./components"; + import * as moment from "moment"; import * as i18n from "../i18n"; @@ -131,7 +133,7 @@ function AuditorDetailsView(props: {rci: ReserveCreationInfo|null}): JSX.Element {rci.exchangeInfo.auditors.map((a) => (

Auditor {a.auditor_url}

-

Public key: {a.auditor_pub}

+

Public key:

Trusted: {rci.trustedAuditorPubs.indexOf(a.auditor_pub) >= 0 ? "yes" : "no"}

Audits {a.denomination_keys.length} of {rci.numOfferedDenoms} denominations

@@ -206,10 +208,12 @@ function FeeDetailsView(props: {rci: ReserveCreationInfo|null}): JSX.Element { return (

Overview

+

Public key:

{i18n.str`Withdrawal fees:`} {withdrawFee}

{i18n.str`Rounding loss:`} {overhead}

{i18n.str`Earliest expiration (for deposit): ${moment.unix(rci.earliestDepositExpiration).fromNow()}`}

Coin Fees

+
@@ -224,10 +228,13 @@ function FeeDetailsView(props: {rci: ReserveCreationInfo|null}): JSX.Element { {uniq.map(row)}
+

Wire Fees

- - {Object.keys(rci.wireFees.feesForType).map(wireFee)} -
+
+ + {Object.keys(rci.wireFees.feesForType).map(wireFee)} +
+
); } @@ -246,3 +253,48 @@ export function WithdrawDetailView(props: {rci: ReserveCreationInfo | null}): JS ); } + + +interface ExpanderTextProps { + text: string; +} + +export class ExpanderText extends ImplicitStateComponent { + private expanded = this.makeState(false); + private textArea: any = undefined; + + componentDidUpdate() { + if (this.expanded() && this.textArea) { + this.textArea.focus(); + this.textArea.scrollTop = 0; + } + } + + render(): JSX.Element { + if (!this.expanded()) { + return ( + { this.expanded(true); }}> + {(this.props.text.length <= 10) + ? this.props.text + : ( + + {this.props.text.substring(0, 10)} + ... + + ) + } + + ); + } + return ( + + ); + } +} +