From c400f7c0f6bff13400eedcd80fdc83e572eb42a8 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.pangilinan@consensys.net>
Date: Wed, 12 Oct 2016 19:35:09 -0700
Subject: Fix gasPrice range

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

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

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 550531d6e..c0168903d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -55,6 +55,7 @@ module.exports = class MetamaskController {
       agreeToEthWarning: this.agreeToEthWarning.bind(this),
       setTOSHash: this.setTOSHash.bind(this),
       checkTOSChange: this.checkTOSChange.bind(this),
+      setGasMultiplier: this.setGasMultiplier.bind(this),
 
       // forward directly to idStore
       createNewVault: idStore.createNewVault.bind(idStore),
@@ -377,4 +378,8 @@ module.exports = class MetamaskController {
   createShapeShiftTx (depositAddress, depositType) {
     this.configManager.createShapeShiftTx(depositAddress, depositType)
   }
+
+  setGasMultiplier (gasMultiplier) {
+    this.configManager.setGasMultiplier(gasMultiplier)
+  }
 }
-- 
cgit v1.2.3


From aace26c4bda151c71f9f8c73669e789ac258e9ee Mon Sep 17 00:00:00 2001
From: Frankie <frankie.pangilinan@consensys.net>
Date: Thu, 13 Oct 2016 16:53:32 -0700
Subject: Create callback and Clean-up details

---
 app/scripts/metamask-controller.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index c48a4c569..38c8b21af 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -379,7 +379,12 @@ module.exports = class MetamaskController {
     this.configManager.createShapeShiftTx(depositAddress, depositType)
   }
 
-  setGasMultiplier (gasMultiplier) {
-    this.configManager.setGasMultiplier(gasMultiplier)
+  setGasMultiplier (gasMultiplier, cb) {
+    try{
+      this.configManager.setGasMultiplier(gasMultiplier)
+      cb()
+    } catch (e) {
+      cb(e)
+    }
   }
 }
-- 
cgit v1.2.3


From 35232c5e293b30da90049b094d87336bb22dc59e Mon Sep 17 00:00:00 2001
From: Frankie <frankie.pangilinan@consensys.net>
Date: Thu, 13 Oct 2016 18:08:15 -0700
Subject: Fix for linting

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

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

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 38c8b21af..8b593d820 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -380,7 +380,7 @@ module.exports = class MetamaskController {
   }
 
   setGasMultiplier (gasMultiplier, cb) {
-    try{
+    try {
       this.configManager.setGasMultiplier(gasMultiplier)
       cb()
     } catch (e) {
-- 
cgit v1.2.3