mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
metamask - rename getSelectedAccount to getSelectedAddress
This commit is contained in:
parent
7a0acb2333
commit
b1de2cdefa
@ -71,7 +71,7 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
txList: this.configManager.getTxList(),
|
||||
txHistoryLimit: 40,
|
||||
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),
|
||||
getNetwork: this.getStateNetwork.bind(this),
|
||||
signTransaction: this.keyringController.signTransaction.bind(this.keyringController),
|
||||
@ -125,7 +125,7 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
rpcUrl: this.configManager.getCurrentRpcAddress(),
|
||||
// account mgmt
|
||||
getAccounts: (cb) => {
|
||||
let selectedAccount = this.preferencesController.getSelectedAccount()
|
||||
let selectedAccount = this.preferencesController.getSelectedAddress()
|
||||
let result = selectedAccount ? [selectedAccount] : []
|
||||
cb(null, result)
|
||||
},
|
||||
@ -342,7 +342,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.preferencesController.getSelectedAccount())
|
||||
cb(null, this.preferencesController.getSelectedAddress())
|
||||
}
|
||||
|
||||
importAccountWithStrategy (strategy, args, cb) {
|
||||
|
@ -13,7 +13,7 @@ module.exports = class TransactionManager extends EventEmitter {
|
||||
this.txList = opts.txList || []
|
||||
this._setTxList = opts.setTxList
|
||||
this.txHistoryLimit = opts.txHistoryLimit
|
||||
this.getSelectedAccount = opts.getSelectedAccount
|
||||
this.getSelectedAddress = opts.getSelectedAddress
|
||||
this.provider = opts.provider
|
||||
this.blockTracker = opts.blockTracker
|
||||
this.txProviderUtils = new TxProviderUtil(this.provider)
|
||||
@ -25,7 +25,7 @@ module.exports = class TransactionManager extends EventEmitter {
|
||||
}
|
||||
|
||||
getState () {
|
||||
var selectedAccount = this.getSelectedAccount()
|
||||
var selectedAccount = this.getSelectedAddress()
|
||||
return {
|
||||
transactions: this.getTxList(),
|
||||
unconfTxs: this.getUnapprovedTxList(),
|
||||
|
Loading…
Reference in New Issue
Block a user