From fadc0617df016ad1fa3d1c92e220a8e9ede6379d Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:52:49 -0700
Subject: [PATCH] Make tx calculations account for gas prices

---
 app/scripts/lib/pending-balance-calculator.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/scripts/lib/pending-balance-calculator.js b/app/scripts/lib/pending-balance-calculator.js
index 8564f0134..29f1fd63a 100644
--- a/app/scripts/lib/pending-balance-calculator.js
+++ b/app/scripts/lib/pending-balance-calculator.js
@@ -32,9 +32,15 @@ class PendingBalanceCalculator {
 
   valueFor (tx) {
     const txValue = tx.txParams.value
-    const normalized = normalize(txValue).substring(2)
     const value = this.hexToBn(txValue)
-    return value
+    const gasPrice = this.hexToBn(tx.txParams.gasPrice)
+
+    const gas = tx.txParams.gas
+    const gasLimit = tx.txParams.gasLimit
+    const gasLimitBn = this.hexToBn(gas || gasLimit)
+
+    const gasCost = gasPrice.mul(gasLimitBn)
+    return value.add(gasCost)
   }
 
   hexToBn (hex) {