From b6e8791bc2bc912d874edcc92fcf3c4ce5a9b72a Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 11:59:15 -0700
Subject: test not passing

---
 app/scripts/lib/pending-balance-calculator.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/lib/pending-balance-calculator.js b/app/scripts/lib/pending-balance-calculator.js
index 4f6e03138..9df87e34b 100644
--- a/app/scripts/lib/pending-balance-calculator.js
+++ b/app/scripts/lib/pending-balance-calculator.js
@@ -1,5 +1,6 @@
 const BN = require('ethereumjs-util').BN
 const EthQuery = require('ethjs-query')
+const normalize = require('eth-sig-util').normalize
 
 class PendingBalanceCalculator {
 
@@ -9,15 +10,30 @@ class PendingBalanceCalculator {
   }
 
   async getBalance() {
+    console.log('getting balance')
     const results = await Promise.all([
       this.getBalance(),
       this.getPendingTransactions(),
     ])
+    console.dir(results)
 
     const balance = results[0]
     const pending = results[1]
 
-    return balance
+    console.dir({ balance, pending })
+
+    const pendingValue = pending.reduce(function (total, tx) {
+      return total.sub(this.valueFor(tx))
+    }, new BN(0))
+
+    const balanceBn = new BN(normalize(balance))
+
+    return `0x${ balanceBn.sub(pendingValue).toString(16) }`
+  }
+
+  valueFor (tx) {
+    const value = new BN(normalize(tx.txParams.value))
+    return value
   }
 
 }
-- 
cgit