diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-06-03 08:11:12 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-06-03 08:11:12 +0800 |
commit | 10fec9052f2cd200868de25217bdaa4646fa0913 (patch) | |
tree | ddf77b54eb4bf313eceef367b3b99ce08e9b625e /ui/app | |
parent | 07617dbb075bc0d98725e1116bc936aabda65486 (diff) | |
download | tangerine-wallet-browser-10fec9052f2cd200868de25217bdaa4646fa0913.tar tangerine-wallet-browser-10fec9052f2cd200868de25217bdaa4646fa0913.tar.gz tangerine-wallet-browser-10fec9052f2cd200868de25217bdaa4646fa0913.tar.bz2 tangerine-wallet-browser-10fec9052f2cd200868de25217bdaa4646fa0913.tar.lz tangerine-wallet-browser-10fec9052f2cd200868de25217bdaa4646fa0913.tar.xz tangerine-wallet-browser-10fec9052f2cd200868de25217bdaa4646fa0913.tar.zst tangerine-wallet-browser-10fec9052f2cd200868de25217bdaa4646fa0913.zip |
A couple seed recovery enhancements
- The seed words are no longer stored on `state.appState.currentView.context`, which caused view glitches since it was shared with other views' data.
- The confirmation text warning color is now the same as other error messages'.
Diffstat (limited to 'ui/app')
-rw-r--r-- | ui/app/first-time/create-vault-complete.js | 2 | ||||
-rw-r--r-- | ui/app/recover-seed/confirmation.js | 3 | ||||
-rw-r--r-- | ui/app/reducers/app.js | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/ui/app/first-time/create-vault-complete.js b/ui/app/first-time/create-vault-complete.js index 7d2db8003..9eceb4421 100644 --- a/ui/app/first-time/create-vault-complete.js +++ b/ui/app/first-time/create-vault-complete.js @@ -14,7 +14,7 @@ function CreateVaultCompleteScreen() { function mapStateToProps(state) { return { - seed: state.appState.currentView.context, + seed: state.appState.currentView.seedWords, cachedSeed: state.metamask.seedWords, } } diff --git a/ui/app/recover-seed/confirmation.js b/ui/app/recover-seed/confirmation.js index c7a99ad00..0276d547d 100644 --- a/ui/app/recover-seed/confirmation.js +++ b/ui/app/recover-seed/confirmation.js @@ -65,10 +65,9 @@ RevealSeedConfirmatoin.prototype.render = function() { }, }), - h('h4', { + h(`h4${state && state.confirmationWrong ? '.error' : ''}`, { style: { marginTop: '12px', - color: state && state.confirmationWrong ? 'red' : 'black', } }, `Enter the phrase "I understand" to proceed.`), diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 58303f630..3ee9a61fe 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -25,10 +25,11 @@ function reduceApp(state, action) { } // confirm seed words + var seedWords = state.metamask.seedWords var seedConfView = { name: 'createVaultComplete', + seedWords, } - var seedWords = state.metamask.seedWords var appState = extend({ menuOpen: false, @@ -111,7 +112,7 @@ function reduceApp(state, action) { return extend(appState, { currentView: { name: 'createVaultComplete', - context: action.value, + seedWords: action.value, }, transForward: true, isLoading: false, @@ -210,6 +211,7 @@ function reduceApp(state, action) { return extend(appState, { currentView: { name: seedWords ? 'createVaultComplete' : 'accounts', + seedWords, }, transForward: true, isLoading: false, |