m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-23 20:05:27 +02:00
Code
6,572 Commits 2 Branches 0 Tags 265 MiB
096851d091
Commit Graph

8 Commits

Author SHA1 Message Date
Paul Bouchon
5ec631cad3
Handle Promise rejections when importing accounts (#4142) 
* Silently catch import failures since errors exist in Redux state
* Add comment about no-op catch statement
 2018-04-30 18:07:25 -04:00
Alexander Tseung
4c15c0d3ba Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-05 23:17:22 -07:00
Alexander Tseung
ba23843f91 Fix merge conflicts 2018-03-30 16:18:48 -07:00
Alexander Tseung
ef61ef2ce8 Fix i18n merge conflicts 2018-03-29 09:37:29 -07:00
Alexander Tseung
58f52b2b8d Fix merge conflicts. Refactor onboarding flow. 2018-03-28 13:23:50 -07:00
Alexander Tseung
6f367a5a6b Fix merge conflicts 2018-03-27 00:20:35 -07:00
Alexander Tseung
4f1fe1da62 Fix merge conflicts from uat-next 2018-01-31 18:24:20 -08:00
Alexander Tseung
0c6fef3dec Add create new account routes, fix conflicts from uat updates 2018-01-31 18:08:49 -08:00