aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorThomas <thomas.b.huang@gmail.com>2018-05-08 22:11:29 +0800
committerThomas <thomas.b.huang@gmail.com>2018-05-08 22:11:29 +0800
commit6c9b303dbd37b0ccad98d05a7b88824bf65de542 (patch)
treebf581bb3e98ed5a98ec85248e976a357d3bde58e /app/scripts/metamask-controller.js
parentf7a3d8887cf7e6fd198e3143825f0f8a50765376 (diff)
parentcaf5a6c15c3375d9d64116d80d87eb064e955e59 (diff)
downloadtangerine-wallet-browser-6c9b303dbd37b0ccad98d05a7b88824bf65de542.tar
tangerine-wallet-browser-6c9b303dbd37b0ccad98d05a7b88824bf65de542.tar.gz
tangerine-wallet-browser-6c9b303dbd37b0ccad98d05a7b88824bf65de542.tar.bz2
tangerine-wallet-browser-6c9b303dbd37b0ccad98d05a7b88824bf65de542.tar.lz
tangerine-wallet-browser-6c9b303dbd37b0ccad98d05a7b88824bf65de542.tar.xz
tangerine-wallet-browser-6c9b303dbd37b0ccad98d05a7b88824bf65de542.tar.zst
tangerine-wallet-browser-6c9b303dbd37b0ccad98d05a7b88824bf65de542.zip
Merge branch 'develop' into e2e-tests
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 c4a73d8ea..a90acb4d5 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -382,6 +382,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),