From 8f35362dad9914cac16f421745a27a1cdd0f02bc Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 24 May 2017 16:45:57 +0200 Subject: style, deduplication and doc comments --- src/pages/add-auditor.tsx | 1 - src/pages/auditors.tsx | 1 - src/pages/confirm-contract.tsx | 8 ++++---- src/pages/payback.tsx | 5 ++--- src/pages/popup.tsx | 21 +++++++++++---------- src/pages/tree.tsx | 19 +++++++++---------- 6 files changed, 26 insertions(+), 29 deletions(-) (limited to 'src/pages') diff --git a/src/pages/add-auditor.tsx b/src/pages/add-auditor.tsx index db283eade..8bef557d9 100644 --- a/src/pages/add-auditor.tsx +++ b/src/pages/add-auditor.tsx @@ -36,7 +36,6 @@ import { getCurrencies, updateCurrency, } from "../wxApi"; -import { prettyAmount } from "../renderHtml"; import { getTalerStampDate } from "../helpers"; import * as React from "react"; diff --git a/src/pages/auditors.tsx b/src/pages/auditors.tsx index 762d22ad8..f263d2ec9 100644 --- a/src/pages/auditors.tsx +++ b/src/pages/auditors.tsx @@ -37,7 +37,6 @@ import { getCurrencies, updateCurrency, } from "../wxApi"; -import { prettyAmount } from "../renderHtml"; import { getTalerStampDate } from "../helpers"; import * as React from "react"; import * as ReactDOM from "react-dom"; diff --git a/src/pages/confirm-contract.tsx b/src/pages/confirm-contract.tsx index 6c2480c1e..47db94ee8 100644 --- a/src/pages/confirm-contract.tsx +++ b/src/pages/confirm-contract.tsx @@ -23,10 +23,10 @@ /** * Imports. */ -import {Contract, AmountJson, ExchangeRecord} from "../types"; -import {OfferRecord} from "../wallet"; -import {renderContract, prettyAmount} from "../renderHtml"; -import {getExchanges} from "../wxApi"; +import { Contract, AmountJson, ExchangeRecord } from "../types"; +import { OfferRecord } from "../wallet"; +import { renderContract } from "../renderHtml"; +import { getExchanges } from "../wxApi"; import * as i18n from "../i18n"; import * as React from "react"; import * as ReactDOM from "react-dom"; diff --git a/src/pages/payback.tsx b/src/pages/payback.tsx index 9e463d4a0..01f5a64e4 100644 --- a/src/pages/payback.tsx +++ b/src/pages/payback.tsx @@ -40,8 +40,7 @@ import { getPaybackReserves, withdrawPaybackReserve, } from "../wxApi"; -import { prettyAmount } from "../renderHtml"; -import { getTalerStampDate } from "../helpers"; +import { amountToPretty, getTalerStampDate } from "../helpers"; import * as React from "react"; import * as ReactDOM from "react-dom"; @@ -80,7 +79,7 @@ class Payback extends ImplicitStateComponent {
{reserves.map(r => (
-

Reserve for ${prettyAmount(r.current_amount!)}

+

Reserve for ${amountToPretty(r.current_amount!)}

  • Exchange: ${r.exchange_base_url}
diff --git a/src/pages/popup.tsx b/src/pages/popup.tsx index c0d280db7..aef5a3df8 100644 --- a/src/pages/popup.tsx +++ b/src/pages/popup.tsx @@ -26,12 +26,13 @@ "use strict"; import BrowserClickedEvent = chrome.browserAction.BrowserClickedEvent; -import {HistoryRecord, HistoryLevel} from "../wallet"; +import { HistoryRecord, HistoryLevel } from "../wallet"; import { AmountJson, WalletBalance, Amounts, WalletBalanceEntry } from "../types"; -import {abbrev, prettyAmount} from "../renderHtml"; +import { amountToPretty } from "../helpers"; +import { abbrev } from "../renderHtml"; import * as i18n from "../i18n"; import * as React from "react"; import * as ReactDOM from "react-dom"; @@ -249,15 +250,15 @@ class WalletBalanceView extends React.Component { let incoming: JSX.Element | undefined; let payment: JSX.Element | undefined; - console.log("available: ", entry.pendingIncoming ? prettyAmount(entry.available) : null); - console.log("incoming: ", entry.pendingIncoming ? prettyAmount(entry.pendingIncoming) : null); + console.log("available: ", entry.pendingIncoming ? amountToPretty(entry.available) : null); + console.log("incoming: ", entry.pendingIncoming ? amountToPretty(entry.pendingIncoming) : null); if (Amounts.isNonZero(entry.pendingIncoming)) { incoming = ( {"+"} - {prettyAmount(entry.pendingIncoming)} + {amountToPretty(entry.pendingIncoming)} {" "} incoming @@ -269,7 +270,7 @@ class WalletBalanceView extends React.Component { payment = ( - {prettyAmount(entry.pendingPayment)} + {amountToPretty(entry.pendingPayment)} {" "} being spent @@ -335,7 +336,7 @@ function formatHistoryItem(historyItem: HistoryRecord) { case "create-reserve": return ( - Bank requested reserve ({abbrev(d.reservePub)}) for {prettyAmount(d.requestedAmount)}. + Bank requested reserve ({abbrev(d.reservePub)}) for {amountToPretty(d.requestedAmount)}. ); case "confirm-reserve": { @@ -345,7 +346,7 @@ function formatHistoryItem(historyItem: HistoryRecord) { return ( Started to withdraw - {" "}{prettyAmount(d.requestedAmount)}{" "} + {" "}{amountToPretty(d.requestedAmount)}{" "} from {exchange} ({pub}). ); @@ -362,7 +363,7 @@ function formatHistoryItem(historyItem: HistoryRecord) { } case "depleted-reserve": { let exchange = d.exchangeBaseUrl ? (new URI(d.exchangeBaseUrl)).host() : "??"; - let amount = prettyAmount(d.requestedAmount); + let amount = amountToPretty(d.requestedAmount); let pub = abbrev(d.reservePub); return ( @@ -376,7 +377,7 @@ function formatHistoryItem(historyItem: HistoryRecord) { let fulfillmentLinkElem = view product; return ( - Paid {prettyAmount(d.amount)} to merchant {merchantElem}. ({fulfillmentLinkElem}) + Paid {amountToPretty(d.amount)} to merchant {merchantElem}. ({fulfillmentLinkElem}) ); } diff --git a/src/pages/tree.tsx b/src/pages/tree.tsx index 201d411ac..8d1258c51 100644 --- a/src/pages/tree.tsx +++ b/src/pages/tree.tsx @@ -35,8 +35,7 @@ import { getReserves, getExchanges, getCoins, getPreCoins, refresh, getDenoms, payback, } from "../wxApi"; -import { prettyAmount } from "../renderHtml"; -import { getTalerStampDate } from "../helpers"; +import { amountToPretty, getTalerStampDate } from "../helpers"; import * as React from "react"; import * as ReactDOM from "react-dom"; @@ -52,8 +51,8 @@ class ReserveView extends React.Component {
  • Key: {r.reserve_pub}
  • Created: {(new Date(r.created * 1000).toString())}
    • -
  • Current: {r.current_amount ? prettyAmount(r.current_amount!) : "null"}
    • -
  • Requested: {prettyAmount(r.requested_amount)}
    • +
  • Current: {r.current_amount ? amountToPretty(r.current_amount!) : "null"}
    • +
  • Requested: {amountToPretty(r.requested_amount)}
  • Confirmed: {r.confirmed}
@@ -130,7 +129,7 @@ class CoinView extends React.Component {
  • Key: {c.coinPub}
    • -
  • Current amount: {prettyAmount(c.currentAmount)}
    • +
  • Current amount: {amountToPretty(c.currentAmount)}
  • Denomination:
  • Suspended: {(c.suspended || false).toString()}
  • Status: {CoinStatus[c.status]}
    • @@ -300,11 +299,11 @@ class DenominationList extends ImplicitStateComponent {
    • Offered: {d.isOffered ? "yes" : "no"}
      • -
    • Value: {prettyAmount(d.value)}
      • -
    • Withdraw fee: {prettyAmount(d.feeWithdraw)}
      • -
    • Refresh fee: {prettyAmount(d.feeRefresh)}
      • -
    • Deposit fee: {prettyAmount(d.feeDeposit)}
      • -
    • Refund fee: {prettyAmount(d.feeRefund)}
      • +
    • Value: {amountToPretty(d.value)}
      • +
    • Withdraw fee: {amountToPretty(d.feeWithdraw)}
      • +
    • Refresh fee: {amountToPretty(d.feeRefresh)}
      • +
    • Deposit fee: {amountToPretty(d.feeDeposit)}
      • +
    • Refund fee: {amountToPretty(d.feeRefund)}
    • Start: {getTalerStampDate(d.stampStart)!.toString()}
    • Withdraw expiration: {getTalerStampDate(d.stampExpireWithdraw)!.toString()}
    • Legal expiration: {getTalerStampDate(d.stampExpireLegal)!.toString()}
      • -- cgit v1.2.3