diff options
Merge pull request #181 from MetaMask/PostPresentationFixup
Post presentation fixup
-rw-r--r-- | test/unit/actions/tx_test.js | 2 | ||||
-rw-r--r-- | ui/app/account-detail.js | 6 | ||||
-rw-r--r-- | ui/app/actions.js | 2 |
3 files changed, 5 insertions, 5 deletions
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(); diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 06ef6ff02..2775e24fb 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -31,9 +31,9 @@ function AccountDetailScreen() { AccountDetailScreen.prototype.render = function() { var state = this.props - var selected = state.address || Object.keys(state.accounts[0]).address - var identity = state.identities[state.address] - var account = state.accounts[state.address] + var selected = state.address || Object.keys(state.accounts)[0] + 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()) }) } } |