diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-07 07:21:18 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-07 07:21:18 +0800 |
| commit | 7c9d942ba165ff53f44985793f28ffb48fa578e1 (patch) | |
| tree | c588281c58c8bae4a4da228b2e27ea708c4eb09d /app/scripts/metamask-controller.js | |
| parent | 6b2511f94f436a30c6c683f9da2c3142d9a6461c (diff) | |
| parent | b4aaf30d6fe829f18dea68a5e6cc321b9fb00d4e (diff) | |
| download | tangerine-wallet-browser-7c9d942ba165ff53f44985793f28ffb48fa578e1.tar.gz tangerine-wallet-browser-7c9d942ba165ff53f44985793f28ffb48fa578e1.tar.zst tangerine-wallet-browser-7c9d942ba165ff53f44985793f28ffb48fa578e1.zip | |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support
Diffstat (limited to 'app/scripts/metamask-controller.js')
| -rw-r--r-- | app/scripts/metamask-controller.js | 1 |
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), |