From 7f32560b037b3a9b097a33a2e640d2e0c89ccd70 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 10 May 2016 10:31:53 -0700 Subject: [PATCH 1/3] Fix account loading bug --- ui/app/account-detail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 06ef6ff02..e309d5f16 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -31,7 +31,7 @@ function AccountDetailScreen() { AccountDetailScreen.prototype.render = function() { var state = this.props - var selected = state.address || Object.keys(state.accounts[0]).address + var selected = state.address || Object.keys(state.accounts)[0] var identity = state.identities[state.address] var account = state.accounts[state.address] var accountDetail = state.accountDetail From d3b541e126df844caaf1d8299290a7c7dbcd9698 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 10 May 2016 10:45:31 -0700 Subject: [PATCH 2/3] Fix transition bugs after vault restore --- ui/app/account-detail.js | 4 ++-- ui/app/actions.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index e309d5f16..2775e24fb 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -32,8 +32,8 @@ function AccountDetailScreen() { AccountDetailScreen.prototype.render = function() { var state = this.props var selected = state.address || Object.keys(state.accounts)[0] - var identity = state.identities[state.address] - var account = state.accounts[state.address] + var identity = state.identities[selected] + var account = state.accounts[selected] var accountDetail = state.accountDetail var transactions = state.transactions diff --git a/ui/app/actions.js b/ui/app/actions.js index 5e4a0d7da..5c5805c29 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -135,8 +135,8 @@ function recoverFromSeed(password, seed) { dispatch(this.hideLoadingIndication()) if (err) return dispatch(this.displayWarning(err.message)) + dispatch(this.goHome()) dispatch(this.unlockMetamask()) - dispatch(this.showAccountsPage()) }) } } From e69131fb392f8c1f593f14ad118ab768d660ee93 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 10 May 2016 10:46:55 -0700 Subject: [PATCH 3/3] Remove test only statement --- test/unit/actions/tx_test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/actions/tx_test.js b/test/unit/actions/tx_test.js index 1eb759511..c08a8aa26 100644 --- a/test/unit/actions/tx_test.js +++ b/test/unit/actions/tx_test.js @@ -7,7 +7,7 @@ var sinon = require('sinon') var actions = require(path.join(__dirname, '..', '..', '..', 'ui', 'app', 'actions.js')) var reducers = require(path.join(__dirname, '..', '..', '..', 'ui', 'app', 'reducers.js')) -describe.only('tx confirmation screen', function() { +describe('tx confirmation screen', function() { beforeEach(function() { this.sinon = sinon.sandbox.create();