aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-05-17 02:57:07 +0800
committerkumavis <aaron@kumavis.me>2018-05-17 02:57:07 +0800
commitc27d9162d7001fa2bd6cfb98dd110716951d2d1b (patch)
tree19f5d4780b3ee82c0e9c9fe2a9c2edad745dd084 /app/scripts/metamask-controller.js
parenta1d13d45cf7451162b071e5507f1e31b12574e6e (diff)
parent6e79225dbff512ab9bcae2731bcfc4ce33e98664 (diff)
downloadtangerine-wallet-browser-c27d9162d7001fa2bd6cfb98dd110716951d2d1b.tar
tangerine-wallet-browser-c27d9162d7001fa2bd6cfb98dd110716951d2d1b.tar.gz
tangerine-wallet-browser-c27d9162d7001fa2bd6cfb98dd110716951d2d1b.tar.bz2
tangerine-wallet-browser-c27d9162d7001fa2bd6cfb98dd110716951d2d1b.tar.lz
tangerine-wallet-browser-c27d9162d7001fa2bd6cfb98dd110716951d2d1b.tar.xz
tangerine-wallet-browser-c27d9162d7001fa2bd6cfb98dd110716951d2d1b.tar.zst
tangerine-wallet-browser-c27d9162d7001fa2bd6cfb98dd110716951d2d1b.zip
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 67d257fea..a6b5d3453 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -381,6 +381,7 @@ module.exports = class MetamaskController extends EventEmitter {
updateTransaction: nodeify(txController.updateTransaction, txController),
updateAndApproveTransaction: nodeify(txController.updateAndApproveTransaction, txController),
retryTransaction: nodeify(this.retryTransaction, this),
+ isNonceTaken: nodeify(txController.isNonceTaken, txController),
// messageManager
signMessage: nodeify(this.signMessage, this),