aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2018-02-05 13:26:06 +0100
committerFlorian Dold <florian.dold@gmail.com>2018-02-05 13:26:06 +0100
commitd088c7503cd0a356d260ac63a896f1ce5025f2ef (patch)
treece236c2bbdfdce04cc0b7b618f183a1e34e06c4b
parent4e30e1e0e945560b41f2300d2e09c77b2c7a7ec4 (diff)
downloadwallet-core-d088c7503cd0a356d260ac63a896f1ce5025f2ef.tar.xz
count coins being spent properly
-rw-r--r--src/wallet.ts2
-rw-r--r--src/webex/pages/popup.tsx3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/wallet.ts b/src/wallet.ts
index 95e7246fb..7c8aa7729 100644
--- a/src/wallet.ts
+++ b/src/wallet.ts
@@ -1849,7 +1849,7 @@ export class Wallet {
return balance;
}
for (const c of t.payReq.coins) {
- addTo(balance, "pendingIncoming", Amounts.parseOrThrow(c.contribution), c.exchange_url);
+ addTo(balance, "pendingPayment", Amounts.parseOrThrow(c.contribution), c.exchange_url);
}
return balance;
}
diff --git a/src/webex/pages/popup.tsx b/src/webex/pages/popup.tsx
index 134ee6dea..6bba10141 100644
--- a/src/webex/pages/popup.tsx
+++ b/src/webex/pages/popup.tsx
@@ -282,7 +282,8 @@ class WalletBalanceView extends React.Component<any, any> {
if (Amounts.isNonZero(entry.pendingPayment)) {
payment = (
<i18n.Translate wrap="span">
- <span style={{color: "darkblue"}}>
+ <span style={{color: "red"}}>
+ {"-"}
{renderAmount(entry.pendingPayment)}
</span>
{" "}