aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-01-31 07:25:12 +0800
committerkumavis <aaron@kumavis.me>2017-01-31 07:25:12 +0800
commit2fa60cfcbfdeb43599007f0dd26fd44a4beec8f1 (patch)
treed42ef1e2402cdaebcad3f72f6887b5e3999b3c95 /app/scripts/metamask-controller.js
parentf9b31fe2c3a43339a4519761e4c8b2f3813e85e0 (diff)
downloadtangerine-wallet-browser-2fa60cfcbfdeb43599007f0dd26fd44a4beec8f1.tar
tangerine-wallet-browser-2fa60cfcbfdeb43599007f0dd26fd44a4beec8f1.tar.gz
tangerine-wallet-browser-2fa60cfcbfdeb43599007f0dd26fd44a4beec8f1.tar.bz2
tangerine-wallet-browser-2fa60cfcbfdeb43599007f0dd26fd44a4beec8f1.tar.lz
tangerine-wallet-browser-2fa60cfcbfdeb43599007f0dd26fd44a4beec8f1.tar.xz
tangerine-wallet-browser-2fa60cfcbfdeb43599007f0dd26fd44a4beec8f1.tar.zst
tangerine-wallet-browser-2fa60cfcbfdeb43599007f0dd26fd44a4beec8f1.zip
continue rename selectedAccount to selectedAddress
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index e081188ce..fc7df5137 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -126,8 +126,8 @@ module.exports = class MetamaskController extends EventEmitter {
rpcUrl: this.configManager.getCurrentRpcAddress(),
// account mgmt
getAccounts: (cb) => {
- let selectedAccount = this.preferencesController.getSelectedAddress()
- let result = selectedAccount ? [selectedAccount] : []
+ let selectedAddress = this.preferencesController.getSelectedAddress()
+ let result = selectedAddress ? [selectedAddress] : []
cb(null, result)
},
// tx signing
@@ -154,9 +154,9 @@ module.exports = class MetamaskController extends EventEmitter {
)
function selectPublicState(state) {
- const result = { selectedAccount: undefined }
+ const result = { selectedAddress: undefined }
try {
- result.selectedAccount = state.KeyringController.selectedAccount
+ result.selectedAddress = state.KeyringController.selectedAddress
} catch (_) {}
return result
}