From b6b4be61d9f01f309b8f4ce708fa1220f84a5d8f Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Wed, 9 Nov 2016 16:29:24 -0800
Subject: Fix bug for increasing gas by 20 percent.

---
 app/scripts/metamask-controller.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/scripts/metamask-controller.js')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 8b593d820..da05e5f5d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -215,7 +215,6 @@ module.exports = class MetamaskController {
 
     let err = this.enforceTxValidations(txParams)
     if (err) return onTxDoneCb(err)
-
     idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => {
       if (err) return onTxDoneCb(err)
       this.sendUpdate()
-- 
cgit v1.2.3


From 17aac2dbc54b733aeed5f16ef2e7bd8378060ca9 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.pangilinan@consensys.net>
Date: Thu, 10 Nov 2016 19:07:12 -0800
Subject: fix tx data so it has the network id

---
 app/scripts/metamask-controller.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'app/scripts/metamask-controller.js')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 4c01b23d8..07d365283 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -17,6 +17,7 @@ module.exports = class MetamaskController {
     this.configManager = new ConfigManager(opts)
     this.keyringController = new KeyringController({
       configManager: this.configManager,
+      getNetwork: this.getStateNetwork.bind(this),
     })
     this.provider = this.initializeProvider(opts)
     this.ethStore = new EthStore(this.provider)
@@ -399,4 +400,9 @@ module.exports = class MetamaskController {
       cb(e)
     }
   }
+
+  getStateNetwork () {
+    return this.state.network
+  }
 }
+
-- 
cgit v1.2.3