aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-11-11 12:36:50 +0800
committerGitHub <noreply@github.com>2016-11-11 12:36:50 +0800
commitad290d3edca99daa22d595a26e63ac6dff480d9d (patch)
tree8948496230e160c389ad57ab8ed26b9d8e3557a3 /app/scripts/metamask-controller.js
parent161ff62fdcf6f76f7243a1e865dd0cccbc89121f (diff)
parent17aac2dbc54b733aeed5f16ef2e7bd8378060ca9 (diff)
downloadtangerine-wallet-browser-ad290d3edca99daa22d595a26e63ac6dff480d9d.tar
tangerine-wallet-browser-ad290d3edca99daa22d595a26e63ac6dff480d9d.tar.gz
tangerine-wallet-browser-ad290d3edca99daa22d595a26e63ac6dff480d9d.tar.bz2
tangerine-wallet-browser-ad290d3edca99daa22d595a26e63ac6dff480d9d.tar.lz
tangerine-wallet-browser-ad290d3edca99daa22d595a26e63ac6dff480d9d.tar.xz
tangerine-wallet-browser-ad290d3edca99daa22d595a26e63ac6dff480d9d.tar.zst
tangerine-wallet-browser-ad290d3edca99daa22d595a26e63ac6dff480d9d.zip
Merge pull request #802 from MetaMask/confTxFix
Conf tx fix
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index a165a2e2a..07d365283 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -17,6 +17,7 @@ module.exports = class MetamaskController {
this.configManager = new ConfigManager(opts)
this.keyringController = new KeyringController({
configManager: this.configManager,
+ getNetwork: this.getStateNetwork.bind(this),
})
this.provider = this.initializeProvider(opts)
this.ethStore = new EthStore(this.provider)
@@ -218,7 +219,6 @@ module.exports = class MetamaskController {
let err = this.enforceTxValidations(txParams)
if (err) return onTxDoneCb(err)
-
keyringController.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => {
if (err) return onTxDoneCb(err)
this.sendUpdate()
@@ -400,4 +400,9 @@ module.exports = class MetamaskController {
cb(e)
}
}
+
+ getStateNetwork () {
+ return this.state.network
+ }
}
+