diff options
| author | Bruno <brunobar79@gmail.com> | 2018-05-17 10:38:51 +0800 |
|---|---|---|
| committer | Bruno <brunobar79@gmail.com> | 2018-05-17 10:38:51 +0800 |
| commit | 3dd58463caef98c2cc1f068931624795a43912db (patch) | |
| tree | b49a2e4feffd33e3b96d43ec29f2ca1071912e67 /app/scripts/metamask-controller.js | |
| parent | 3180b69b974f8ffc0d6546a647725d1bf8539483 (diff) | |
| parent | 708422432c634ffbd4c73388f980c43f766b3355 (diff) | |
| download | tangerine-wallet-browser-3dd58463caef98c2cc1f068931624795a43912db.tar.gz tangerine-wallet-browser-3dd58463caef98c2cc1f068931624795a43912db.tar.zst tangerine-wallet-browser-3dd58463caef98c2cc1f068931624795a43912db.zip | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'app/scripts/metamask-controller.js')
| -rw-r--r-- | app/scripts/metamask-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index c4a73d8ea..a6b5d3453 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -355,7 +355,6 @@ module.exports = class MetamaskController extends EventEmitter { submitPassword: nodeify(keyringController.submitPassword, keyringController), // network management - setNetworkEndpoints: nodeify(networkController.setNetworkEndpoints, networkController), setProviderType: nodeify(networkController.setProviderType, networkController), setCustomRpc: nodeify(this.setCustomRpc, this), @@ -382,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), |