Merge branch 'dev' into messageManagerCleanUp

2 files changed, 3 insertions, 3 deletions

diff --git a/test/integration/mocks/oldVault.json b/test/integration/mocks/oldVault.json
index 5861c41d7..b908ed7ca 100644
--- a/test/integration/mocks/oldVault.json
+++ b/test/integration/mocks/oldVault.json
@@ -13,7 +13,7 @@
       "provider": {
         "type": "testnet"
       },
-      "selectedAccount": "0x4dd5d356c5a016a220bcd69e82e5af680a430d00"
+      "selectedAddress": "0x4dd5d356c5a016a220bcd69e82e5af680a430d00"
     },
     "showSeedWords": false,
     "isEthConfirmed": true
diff --git a/test/unit/actions/set_selected_account_test.js b/test/unit/actions/set_selected_account_test.js
index f72ca82e4..2dc42d2ec 100644
--- a/test/unit/actions/set_selected_account_test.js
+++ b/test/unit/actions/set_selected_account_test.js
@@ -31,7 +31,7 @@ describe('SHOW_ACCOUNT_DETAIL', function() {
   it('updates metamask state', function() {
     var initialState = {
       metamask: {
-        selectedAccount: 'foo'
+        selectedAddress: 'foo'
       }
     }
     freeze(initialState)
@@ -43,6 +43,6 @@ describe('SHOW_ACCOUNT_DETAIL', function() {
     freeze(action)
 
     var resultingState = reducers(initialState, action)
-    assert.equal(resultingState.metamask.selectedAccount, action.value)
+    assert.equal(resultingState.metamask.selectedAddress, action.value)
   })
 })