Dan
4f0881e41b
Merge branch 'master' into i18n-translator-redux
2018-03-26 16:13:49 -02:30
Alexander Tseung
cfa2592d78
Update button styles
2018-03-25 22:58:04 -07:00
Dan
a82631791e
Lint fixes
2018-03-21 23:48:10 -02:30
Dan
18f8583529
Fix references to undefined 'this.props'
2018-03-21 23:10:28 -02:30
Dan
d24a0590d3
i18n redux solution doesn't require importing t() and passing state to each t() call; t is just available on props.
2018-03-21 22:11:47 -02:30
kumavis
29cc2f8ab9
Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux
2018-03-20 13:01:08 -07:00
Thomas
cffaf44714
i18n Import flow
2018-03-20 09:49:12 -07:00
Dan
2ddc2cc1fb
Lint fixes.
2018-03-19 16:53:06 -02:30
Dan
5fe0be722b
Handle i18n with redux.
2018-03-15 21:59:45 -02:30
kumavis
34aeef50a0
i18n - load locales manually
2018-03-14 16:32:35 -07:00
Thomas
208b3bc4c1
Add i18n back into JsonImportSubview
2018-03-12 08:07:12 -07:00
Thomas Huang
b7c7083a11
Merge branch 'master' into i18n
2018-03-12 10:50:55 -04:00
Alexander Tseung
4b2e52795d
Explicitly define state in import account from json component ( #3491 )
2018-03-09 16:30:31 +01:00
Dan Finlay
abe8bc19a8
Merge branch 'master' into i18n
2018-03-06 20:13:53 -08:00
Dan
2420ad2477
Correct merge conflict resolution errors.
2018-03-06 22:26:13 -03:30
Dan
9d215bab0f
Merge branch 'master' into i18n
2018-03-06 20:45:45 -03:30
Thomas
ee254b4f6f
Import Account disclaimer
2018-03-02 18:24:09 -08:00
Thomas
50f20358c1
Add import account disclaimer
2018-02-27 12:01:09 -08:00
Dan
b0db68a281
Merge branch 'uat' into uat-next
2018-02-07 21:19:14 -03:30
Dan
d8896a8c31
Merge branch 'master' into uat
2018-02-07 16:32:47 -03:30
Dan J Miller
971112d413
[NewUI] Updates capitalization and alignment for the import account screen. ( #3122 )
...
* Updates capitalization and alignment for the import account screen.
* Align elements in import form.
2018-01-31 13:41:13 -08:00
Dan Finlay
11a944719f
Add warning when importing no valid file
...
Fixes #3089
2018-01-30 15:11:05 -08:00
Nick Doiron
abfa74f09a
complete i18n across new UI
2018-01-29 15:29:01 -05:00
Nick Doiron
7da52c5997
separate out cross-browser i18n for extensions
2018-01-24 10:10:28 -10:00
Nick Doiron
99898ac775
better organization of locale file; i18n in more view files
2018-01-23 22:14:47 -10:00
Dan
980e1bfcf8
New add account page with create and import options.
2018-01-12 13:42:51 -08:00
Chi Kei Chan
e61ba93194
Merge branch 'master' into merge-master
2017-11-15 12:03:13 -08:00
Daijiro Wachi
0bfa10e501
Remove warning message when show import page
...
Fixes: https://github.com/MetaMask/metamask-extension/issues/1192
2017-10-30 20:04:44 +01:00
Dan
0ed1add110
Clear import error state on logout.
2017-10-26 12:27:09 -07:00
Chi Kei Chan
e263ae9421
Update Import Account Help Link
2017-10-25 00:38:20 -07:00
Chi Kei Chan
085551b7e6
New Account modal
2017-10-17 22:38:07 -07:00
Alexander Tseung
6defb880fb
Fix SELECT TYPE dropdown changing sizes based on error message ( #2359 )
2017-10-13 13:23:50 -07:00
Dan Finlay
86d367957f
Move responsive ui into its own folder for easier merges
2017-07-20 12:38:38 -07:00
Dan Finlay
5eb3d5d485
Make folder for responsive UI
2017-07-03 15:39:25 -07:00
Thomas Huang
d5f0ee4f5e
Add Back Button for Import Screen
2017-06-27 18:40:47 -07:00
Kevin Serrano
a8ababe2f4
Add a new warning for file import JSON
2017-06-14 10:13:07 -07:00
Thomas Huang
6bdb4c8728
Fix linting warnings
2017-04-26 21:05:45 -07:00
Kevin Serrano
5d14925842
Fix styling of error message.
2017-03-22 16:54:10 -04:00
Dan Finlay
9126652f2e
Implement naieve JSON file importing
...
Doesn't work on any JSON file I have, it's a very naieve strategy provided by ethereumjs-wallet. Will need to raise its sophistication before deploying to production.
2017-01-18 16:15:25 -08:00
Dan Finlay
b52346388b
Added new modular private key import system
...
Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy.
I've created a generic and reusable UI action called `importNewAccount(strategy, args)`.
The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string.
Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back.
This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!).
This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well!
2017-01-18 15:20:48 -08:00
Dan Finlay
1ff4894b67
Allow importing of private key strings
...
Fixes #1021
A top-right menu item now allows `Account Import`. It has a menu (with one item for now) that allows importing a private key string.
Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`.
2017-01-17 16:24:45 -08:00
Dan Finlay
b3cb675a8b
Develop import subviews
2016-11-04 15:32:02 -07:00
Dan Finlay
a7af47db92
Add import account placeholder template
2016-11-04 14:39:53 -07:00
