aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-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/keyring-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/keyring-controller.js')
-rw-r--r--app/scripts/keyring-controller.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 3ebf02c44..5d9dd51a4 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -38,7 +38,7 @@ module.exports = class KeyringController extends EventEmitter {
this._unconfTxCbs = {}
this._unconfMsgCbs = {}
- this.network = opts.network
+ this.getNetwork = opts.getNetwork
// TEMPORARY UNTIL FULL DEPRECATION:
this.idStoreMigrator = new IdStoreMigrator({
@@ -344,13 +344,14 @@ module.exports = class KeyringController extends EventEmitter {
var time = (new Date()).getTime()
var txId = createId()
txParams.metamaskId = txId
- txParams.metamaskNetworkId = this.network
+ txParams.metamaskNetworkId = this.getNetwork()
var txData = {
id: txId,
txParams: txParams,
time: time,
status: 'unconfirmed',
gasMultiplier: configManager.getGasMultiplier() || 1,
+ metamaskNetworkId: this.getNetwork(),
}