taler-typescript-core

commit d088c7503cd0a356d260ac63a896f1ce5025f2ef
parent 4e30e1e0e945560b41f2300d2e09c77b2c7a7ec4
Author: Florian Dold <florian.dold@gmail.com>
Date:   Mon,  5 Feb 2018 13:26:06 +0100

count coins being spent properly

Diffstat:
M
src/wallet.ts
 | 
2
+-
M
src/webex/pages/popup.tsx
 | 
3
++-

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git 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
@@ -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>
           {" "}