diff options
author | kumavis <aaron@kumavis.me> | 2018-06-07 03:05:38 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2018-06-07 03:05:38 +0800 |
commit | 2198276bd533bec767cad954ef8b21c47c0f8c09 (patch) | |
tree | 6e4ff66926a954815a8421c0062012842f236785 /ui/app/components/pages/create-account/import-account/private-key.js | |
parent | ffb8fa16497d0c4a48e3bd4b918dde1ac3adcd5d (diff) | |
parent | 1fb408f62eb081311937420bb42da6c835510590 (diff) | |
download | tangerine-wallet-browser-2198276bd533bec767cad954ef8b21c47c0f8c09.tar.gz tangerine-wallet-browser-2198276bd533bec767cad954ef8b21c47c0f8c09.tar.zst tangerine-wallet-browser-2198276bd533bec767cad954ef8b21c47c0f8c09.zip |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
Diffstat (limited to 'ui/app/components/pages/create-account/import-account/private-key.js')
-rw-r--r-- | ui/app/components/pages/create-account/import-account/private-key.js | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/ui/app/components/pages/create-account/import-account/private-key.js b/ui/app/components/pages/create-account/import-account/private-key.js index e55a47a3c..5df3777da 100644 --- a/ui/app/components/pages/create-account/import-account/private-key.js +++ b/ui/app/components/pages/create-account/import-account/private-key.js @@ -21,6 +21,7 @@ module.exports = compose( function mapStateToProps (state) { return { error: state.appState.warning, + firstAddress: Object.keys(state.metamask.accounts)[0], } } @@ -29,7 +30,8 @@ function mapDispatchToProps (dispatch) { importNewAccount: (strategy, [ privateKey ]) => { return dispatch(actions.importNewAccount(strategy, [ privateKey ])) }, - displayWarning: () => dispatch(actions.displayWarning(null)), + displayWarning: (message) => dispatch(actions.displayWarning(message || null)), + setSelectedAddress: (address) => dispatch(actions.setSelectedAddress(address)), } } @@ -40,7 +42,7 @@ function PrivateKeyImportView () { } PrivateKeyImportView.prototype.render = function () { - const { error } = this.props + const { error, displayWarning } = this.props return ( h('div.new-account-import-form__private-key', [ @@ -60,7 +62,10 @@ PrivateKeyImportView.prototype.render = function () { h('div.new-account-import-form__buttons', {}, [ h('button.btn-default.btn--large.new-account-create-form__button', { - onClick: () => this.props.history.push(DEFAULT_ROUTE), + onClick: () => { + displayWarning(null) + this.props.history.push(DEFAULT_ROUTE) + }, }, [ this.context.t('cancel'), ]), @@ -88,10 +93,16 @@ PrivateKeyImportView.prototype.createKeyringOnEnter = function (event) { PrivateKeyImportView.prototype.createNewKeychain = function () { const input = document.getElementById('private-key-box') const privateKey = input.value - const { importNewAccount, history } = this.props + const { importNewAccount, history, displayWarning, setSelectedAddress, firstAddress } = this.props importNewAccount('Private Key', [ privateKey ]) - // JS runtime requires caught rejections but failures are handled by Redux - .catch() - .then(() => history.push(DEFAULT_ROUTE)) + .then(({ selectedAddress }) => { + if (selectedAddress) { + history.push(DEFAULT_ROUTE) + } else { + displayWarning('Error importing account.') + setSelectedAddress(firstAddress) + } + }) + .catch(err => displayWarning(err)) } |