Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support

1 files changed, 1 insertions, 0 deletions

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 1246629be..d70bac1c3 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -341,6 +341,7 @@ module.exports = class MetamaskController extends EventEmitter {
       markAccountsFound: this.markAccountsFound.bind(this),
       markPasswordForgotten: this.markPasswordForgotten.bind(this),
       unMarkPasswordForgotten: this.unMarkPasswordForgotten.bind(this),
+      getGasPrice: (cb) => cb(null, this.getGasPrice()),
 
       // coinbase
       buyEth: this.buyEth.bind(this),