aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-01-30 16:32:04 +0800
committerkumavis <aaron@kumavis.me>2017-01-30 16:32:04 +0800
commitdd528d886f1d2e017cd55ba7e003493f0bc4579c (patch)
treee701cb7d85f2feddb20e3293c5461a65b09778d3 /app
parent6480c2d8a612a966091aa69c8af5462274e8d04c (diff)
downloadtangerine-wallet-browser-dd528d886f1d2e017cd55ba7e003493f0bc4579c.tar.gz
tangerine-wallet-browser-dd528d886f1d2e017cd55ba7e003493f0bc4579c.tar.zst
tangerine-wallet-browser-dd528d886f1d2e017cd55ba7e003493f0bc4579c.zip
metamask - lookup selectedAccount via keyringController
Diffstat (limited to 'app')
-rw-r--r--app/scripts/keyring-controller.js9
-rw-r--r--app/scripts/metamask-controller.js6
2 files changed, 12 insertions, 3 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 68fc6e882..40cc975f9 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -244,6 +244,15 @@ class KeyringController extends EventEmitter {
return this.fullUpdate()
}
+ // Get Selected Account
+ //
+ // returns String
+ //
+ // Gets the state's `selectedAccount` value
+ getSelectedAccount () {
+ return this.store.getState().selectedAccount
+ }
+
// Save Account Label
// @string account
// @string label
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 422fda3d7..b9a94b0c9 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -65,7 +65,7 @@ module.exports = class MetamaskController extends EventEmitter {
txList: this.configManager.getTxList(),
txHistoryLimit: 40,
setTxList: this.configManager.setTxList.bind(this.configManager),
- getSelectedAccount: this.configManager.getSelectedAccount.bind(this.configManager),
+ getSelectedAccount: this.keyringController.getSelectedAccount.bind(this.keyringController),
getGasMultiplier: this.configManager.getGasMultiplier.bind(this.configManager),
getNetwork: this.getStateNetwork.bind(this),
signTransaction: this.keyringController.signTransaction.bind(this.keyringController),
@@ -116,7 +116,7 @@ module.exports = class MetamaskController extends EventEmitter {
rpcUrl: this.configManager.getCurrentRpcAddress(),
// account mgmt
getAccounts: (cb) => {
- let selectedAccount = this.configManager.getSelectedAccount()
+ let selectedAccount = this.keyringController.getSelectedAccount()
let result = selectedAccount ? [selectedAccount] : []
cb(null, result)
},
@@ -330,7 +330,7 @@ module.exports = class MetamaskController extends EventEmitter {
// ensuring they are only ever available in the background process.
clearSeedWordCache (cb) {
this.configManager.setSeedWords(null)
- cb(null, this.configManager.getSelectedAccount())
+ cb(null, this.keyringController.getSelectedAccount())
}
importAccountWithStrategy (strategy, args, cb) {