diff options
author | Dan <danjm.com@gmail.com> | 2018-03-07 08:15:45 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-03-07 08:15:45 +0800 |
commit | 9d215bab0fe124f036d2ac41f375331c8d43b72b (patch) | |
tree | 6bbbdb2e6a2dcd5948ee8473cad152232c73643b /ui/app/accounts/import | |
parent | f06bca1151b07d908cd90f6efd97064e288e5f27 (diff) | |
parent | 9762a730413129361062804aa8dfc7be7cf74868 (diff) | |
download | tangerine-wallet-browser-9d215bab0fe124f036d2ac41f375331c8d43b72b.tar.gz tangerine-wallet-browser-9d215bab0fe124f036d2ac41f375331c8d43b72b.tar.zst tangerine-wallet-browser-9d215bab0fe124f036d2ac41f375331c8d43b72b.zip |
Merge branch 'master' into i18n
Diffstat (limited to 'ui/app/accounts/import')
-rw-r--r-- | ui/app/accounts/import/index.js | 2 | ||||
-rw-r--r-- | ui/app/accounts/import/json.js | 6 | ||||
-rw-r--r-- | ui/app/accounts/import/private-key.js | 19 |
3 files changed, 20 insertions, 7 deletions
diff --git a/ui/app/accounts/import/index.js b/ui/app/accounts/import/index.js index 6ae74864f..ac6517424 100644 --- a/ui/app/accounts/import/index.js +++ b/ui/app/accounts/import/index.js @@ -38,7 +38,7 @@ AccountImportSubview.prototype.render = function () { h('div.new-account-import-form__select-section', [ - h('div.new-account-import-form__select-label', 'SELECT TYPE'), + h('div.new-account-import-form__select-label', 'Select Type'), h(Select, { className: 'new-account-import-form__select', diff --git a/ui/app/accounts/import/json.js b/ui/app/accounts/import/json.js index eb63a98a9..791759666 100644 --- a/ui/app/accounts/import/json.js +++ b/ui/app/accounts/import/json.js @@ -82,6 +82,12 @@ JsonImportSubview.prototype.createKeyringOnEnter = function (event) { JsonImportSubview.prototype.createNewKeychain = function () { const state = this.state + + if (!state) { + const message = 'You must select a valid file to import.' + return this.props.dispatch(actions.displayWarning(message)) + } + const { fileContents } = state if (!fileContents) { diff --git a/ui/app/accounts/import/private-key.js b/ui/app/accounts/import/private-key.js index e8c192a61..0b49d3281 100644 --- a/ui/app/accounts/import/private-key.js +++ b/ui/app/accounts/import/private-key.js @@ -33,15 +33,22 @@ PrivateKeyImportView.prototype.render = function () { return ( h('div.new-account-import-form__private-key', [ + h('span.new-account-create-form__instruction', t('pastePrivateKey')), - h('input.new-account-import-form__input-password', { - type: 'password', - id: 'private-key-box', - onKeyPress: () => this.createKeyringOnEnter(), - }), + h('div.new-account-import-form__private-key-password-container', [ + + h('span.new-account-import-form__instruction', 'Paste your private key string here:'), + + h('input.new-account-import-form__input-password', { + type: 'password', + id: 'private-key-box', + onKeyPress: () => this.createKeyringOnEnter(), + }), + + ]), - h('div.new-account-create-form__buttons', {}, [ + h('div.new-account-import-form__buttons', {}, [ h('button.new-account-create-form__button-cancel.allcaps', { onClick: () => goHome(), |