aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pages/create-account/import-account/private-key.js
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4716 from MetaMask/i4663-clearErrorMessagesDan J Miller2018-07-041-0/+1
|\ | | | | fixes #4663 - Clear Error Messages when Importing Accounts are Successful
| * fixes 4663Sara Reynolds2018-07-041-0/+1
| |
* | Check that error is defined in import-account error catch.Dan2018-06-291-1/+1
| |
* | Show all errors on account creation screen.Dan2018-06-291-1/+1
|/
* Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-031-2/+2
|\
| * Change btn-secondary styles to btn-default. Make btn-secondary red warning ↵Alexander Tseung2018-06-011-3/+3
| | | | | | | | style buttons
* | Fix then-catch + error handling in import-accountDan2018-05-311-2/+1
| |
* | Importing account by json and private key shows error and does not change ↵Dan2018-05-311-5/+17
|/ | | | account if no selectedAddress comes after import.
* Handle Promise rejections when importing accounts (#4142)Paul Bouchon2018-05-011-0/+2
| | | | * Silently catch import failures since errors exist in Redux state * Add comment about no-op catch statement
* Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵Alexander Tseung2018-04-061-1/+2
| | | | cb-254
* Fix merge conflictsAlexander Tseung2018-03-311-4/+10
|
* Fix i18n merge conflictsAlexander Tseung2018-03-301-5/+4
|
* Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-291-1/+1
|
* Fix merge conflictsAlexander Tseung2018-03-271-6/+7
|
* Fix merge conflicts from uat-nextAlexander Tseung2018-02-011-7/+12
|
* Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-011-0/+83