Merge pull request #869 from MetaMask/dev-cleanup

Dev Cleanup Package

2 files changed, 5 insertions, 5 deletions

diff --git a/ui/app/accounts/account-list-item.js b/ui/app/accounts/account-list-item.js
index 4e0d69ed7..ef7b749e4 100644
--- a/ui/app/accounts/account-list-item.js
+++ b/ui/app/accounts/account-list-item.js
@@ -16,7 +16,7 @@ function AccountListItem () {
 
 AccountListItem.prototype.render = function () {
   const identity = this.props.identity
-  var isSelected = this.props.selectedAddress === identity.address
+  var isSelected = this.props.selectedAccount === identity.address
   var account = this.props.accounts[identity.address]
   const selectedClass = isSelected ? '.selected' : ''
 
diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js
index 2e8321a77..fcb3a7b0f 100644
--- a/ui/app/accounts/index.js
+++ b/ui/app/accounts/index.js
@@ -19,7 +19,7 @@ function mapStateToProps (state) {
     accounts: state.metamask.accounts,
     identities: state.metamask.identities,
     unconfTxs: state.metamask.unconfTxs,
-    selectedAddress: state.metamask.selectedAddress,
+    selectedAccount: state.metamask.selectedAccount,
     scrollToBottom: state.appState.scrollToBottom,
     pending,
   }
@@ -72,7 +72,7 @@ AccountsScreen.prototype.render = function () {
             return h(AccountListItem, {
               key: `acct-panel-${identity.address}`,
               identity,
-              selectedAddress: this.props.selectedAddress,
+              selectedAccount: this.props.selectedAccount,
               accounts: this.props.accounts,
               onShowDetail: this.onShowDetail.bind(this),
               pending,
@@ -133,8 +133,8 @@ AccountsScreen.prototype.navigateToConfTx = function () {
 AccountsScreen.prototype.onSelect = function (address, event) {
   event.stopPropagation()
   // if already selected, deselect
-  if (this.props.selectedAddress === address) address = null
-  this.props.dispatch(actions.setSelectedAddress(address))
+  if (this.props.selectedAccount === address) address = null
+  this.props.dispatch(actions.setSelectedAccount(address))
 }
 
 AccountsScreen.prototype.onShowDetail = function (address, event) {