diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-22 08:21:16 +0800 |
---|---|---|
committer | Kevin Serrano <kevgagser@gmail.com> | 2016-11-22 08:21:16 +0800 |
commit | f5b0795ac5582dd53de728479cf47c43eabfe67c (patch) | |
tree | 9b03db0e3a5d3dfd913abcad6cfbadaff71531d6 /app/scripts/metamask-controller.js | |
parent | 9123e70434fcd35dcb79a587e6d5c00734cb99e4 (diff) | |
download | tangerine-wallet-browser-f5b0795ac5582dd53de728479cf47c43eabfe67c.tar tangerine-wallet-browser-f5b0795ac5582dd53de728479cf47c43eabfe67c.tar.gz tangerine-wallet-browser-f5b0795ac5582dd53de728479cf47c43eabfe67c.tar.bz2 tangerine-wallet-browser-f5b0795ac5582dd53de728479cf47c43eabfe67c.tar.lz tangerine-wallet-browser-f5b0795ac5582dd53de728479cf47c43eabfe67c.tar.xz tangerine-wallet-browser-f5b0795ac5582dd53de728479cf47c43eabfe67c.tar.zst tangerine-wallet-browser-f5b0795ac5582dd53de728479cf47c43eabfe67c.zip |
change all instances of selectedAddress to selectedAccount.
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r-- | app/scripts/metamask-controller.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 951918460..d230b3483 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -67,7 +67,7 @@ module.exports = class MetamaskController { addNewKeyring: keyringController.addNewKeyring.bind(keyringController), addNewAccount: keyringController.addNewAccount.bind(keyringController), submitPassword: keyringController.submitPassword.bind(keyringController), - setSelectedAddress: keyringController.setSelectedAddress.bind(keyringController), + setSelectedAccount: keyringController.setSelectedAccount.bind(keyringController), approveTransaction: keyringController.approveTransaction.bind(keyringController), cancelTransaction: keyringController.cancelTransaction.bind(keyringController), signMessage: keyringController.signMessage.bind(keyringController), @@ -125,8 +125,8 @@ module.exports = class MetamaskController { rpcUrl: this.configManager.getCurrentRpcAddress(), // account mgmt getAccounts: (cb) => { - var selectedAddress = this.configManager.getSelectedAccount() - var result = selectedAddress ? [selectedAddress] : [] + var selectedAccount = this.configManager.getSelectedAccount() + var result = selectedAccount ? [selectedAccount] : [] cb(null, result) }, // tx signing @@ -177,14 +177,14 @@ module.exports = class MetamaskController { // keyringController substate function keyringControllerToPublic (state) { return { - selectedAddress: state.selectedAddress, + selectedAccount: state.selectedAccount, } } // config substate function configToPublic (state) { return { provider: state.provider, - selectedAddress: state.selectedAccount, + selectedAccount: state.selectedAccount, } } // dump obj into store |