m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

metamask - rename getSelectedAccount to getSelectedAddress

Browse Source
This commit is contained in:
kumavis 2017-01-30 13:09:46 -08:00
parent 7a0acb2333
commit b1de2cdefa
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scripts/metamask-controller.js
View File

@ -71,7 +71,7 @@ module.exports = class MetamaskController extends EventEmitter {
txList: this.configManager.getTxList(), txList: this.configManager.getTxList(),
txHistoryLimit: 40, txHistoryLimit: 40,
setTxList: this.configManager.setTxList.bind(this.configManager), setTxList: this.configManager.setTxList.bind(this.configManager),
getSelectedAccount: this.preferencesController.getSelectedAccount.bind(this.preferencesController), getSelectedAddress: this.preferencesController.getSelectedAddress.bind(this.preferencesController),
getGasMultiplier: this.configManager.getGasMultiplier.bind(this.configManager), getGasMultiplier: this.configManager.getGasMultiplier.bind(this.configManager),
getNetwork: this.getStateNetwork.bind(this), getNetwork: this.getStateNetwork.bind(this),
signTransaction: this.keyringController.signTransaction.bind(this.keyringController), signTransaction: this.keyringController.signTransaction.bind(this.keyringController),
@ -125,7 +125,7 @@ module.exports = class MetamaskController extends EventEmitter {
rpcUrl: this.configManager.getCurrentRpcAddress(), rpcUrl: this.configManager.getCurrentRpcAddress(),
// account mgmt // account mgmt
getAccounts: (cb) => { getAccounts: (cb) => {
let selectedAccount = this.preferencesController.getSelectedAccount() let selectedAccount = this.preferencesController.getSelectedAddress()
let result = selectedAccount ? [selectedAccount] : [] let result = selectedAccount ? [selectedAccount] : []
cb(null, result) cb(null, result)
}, },
@ -342,7 +342,7 @@ module.exports = class MetamaskController extends EventEmitter {
// ensuring they are only ever available in the background process. // ensuring they are only ever available in the background process.
clearSeedWordCache (cb) { clearSeedWordCache (cb) {
this.configManager.setSeedWords(null) this.configManager.setSeedWords(null)
cb(null, this.preferencesController.getSelectedAccount()) cb(null, this.preferencesController.getSelectedAddress())
} }
importAccountWithStrategy (strategy, args, cb) { importAccountWithStrategy (strategy, args, cb) {

4
app/scripts/transaction-manager.js
View File

@ -13,7 +13,7 @@ module.exports = class TransactionManager extends EventEmitter {
this.txList = opts.txList || [] this.txList = opts.txList || []
this._setTxList = opts.setTxList this._setTxList = opts.setTxList
this.txHistoryLimit = opts.txHistoryLimit this.txHistoryLimit = opts.txHistoryLimit
this.getSelectedAccount = opts.getSelectedAccount this.getSelectedAddress = opts.getSelectedAddress
this.provider = opts.provider this.provider = opts.provider
this.blockTracker = opts.blockTracker this.blockTracker = opts.blockTracker
this.txProviderUtils = new TxProviderUtil(this.provider) this.txProviderUtils = new TxProviderUtil(this.provider)
@ -25,7 +25,7 @@ module.exports = class TransactionManager extends EventEmitter {
} }
getState () { getState () {
var selectedAccount = this.getSelectedAccount() var selectedAccount = this.getSelectedAddress()
return { return {
transactions: this.getTxList(), transactions: this.getTxList(),
unconfTxs: this.getUnapprovedTxList(), unconfTxs: this.getUnapprovedTxList(),