aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-01-31 05:09:46 +0800
committerkumavis <aaron@kumavis.me>2017-01-31 05:09:46 +0800
commitb1de2cdefa2341eeab8d0269a1b14b349fdd5d16 (patch)
tree3431f67fb9e439fe5b2827cfe120972cc53ca078 /app/scripts/metamask-controller.js
parent7a0acb23337772d3204ed037cf320e02f1e5232a (diff)
downloadtangerine-wallet-browser-b1de2cdefa2341eeab8d0269a1b14b349fdd5d16.tar.gz
tangerine-wallet-browser-b1de2cdefa2341eeab8d0269a1b14b349fdd5d16.tar.zst
tangerine-wallet-browser-b1de2cdefa2341eeab8d0269a1b14b349fdd5d16.zip
metamask - rename getSelectedAccount to getSelectedAddress
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 2f9e37cee..64deae426 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -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) {