diff options
author | Florian Dold <florian.dold@gmail.com> | 2016-10-19 22:49:03 +0200 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2016-10-19 22:49:03 +0200 |
commit | e6763f3fac0d2c9e6f7459499b960b4d5c54fc66 (patch) | |
tree | 6275af237861430a33ecb3aadc395ec26d7d52dc /popup | |
parent | 4fd1e07449c97619dbf1e0e17baa47168644dba9 (diff) | |
download | wallet-core-e6763f3fac0d2c9e6f7459499b960b4d5c54fc66.tar.xz |
show pending outgoing balance in overview
Diffstat (limited to 'popup')
-rw-r--r-- | popup/popup.tsx | 54 |
1 files changed, 42 insertions, 12 deletions
diff --git a/popup/popup.tsx b/popup/popup.tsx index 31f950c21..121562e31 100644 --- a/popup/popup.tsx +++ b/popup/popup.tsx @@ -221,12 +221,46 @@ class WalletBalanceView extends preact.Component<any, any> { getting started?</div>; } - formatPending(amount: AmountJson) { - return ( - <span> - (<span style="color: darkgreen">{prettyAmount(amount)}</span> pending) - </span> - ); + formatPending(entry: WalletBalanceEntry): JSX.Element { + 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); + + if (Amounts.isNonZero(entry.pendingIncoming)) { + incoming = ( + <span> + <span style="color: darkgreen"> + {"+"} + {prettyAmount(entry.pendingIncoming)} + </span> + {" "} + incoming + </span>); + } + + if (Amounts.isNonZero(entry.pendingPayment)) { + payment = ( + <span> + <span style="color: darkblue"> + {prettyAmount(entry.pendingPayment)} + </span> + {" "} + being spent + </span>); + } + + let l = [incoming, payment].filter((x) => x !== undefined); + if (l.length == 0) { + return <span />; + } + + if (l.length == 1) { + return <span>({l})</span> + } + return <span>({l[0]}, {l[1]})</span>; + } render(): JSX.Element { @@ -243,12 +277,8 @@ class WalletBalanceView extends preact.Component<any, any> { return ( <p> {prettyAmount(entry.available)} - { " "} - {Amounts.isNonZero(entry.pendingIncoming) - ? this.formatPending(entry.pendingIncoming) - : [] - } - + {" "} + {this.formatPending(entry)} </p> ); }); |