1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-30 16:18:07 +01:00
Commit Graph

73 Commits

Author SHA1 Message Date
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 J Miller
8378445112 [NewUI] Set default new account name as placeholder, but not value (#3121)
* Set default new account name as placehold, and not value, in new account create screen.

* Set new account number in create-form.js in constructor.
2018-01-31 13:40:14 -08:00
Dan Finlay
11a944719f Add warning when importing no valid file
Fixes #3089
2018-01-30 15:11:05 -08:00
Dan
2bc85ea72f Fix input box padding and select highlight in new account create and import page. 2018-01-12 13:42:51 -08: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
a22adec66f Replace ui with responsive-ui 2017-07-24 17:05:07 -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
Dan Finlay
b4e6ea9db7 Fix fiat rendering
Fixes #1439.

When reorganizing fiat-value component to not use global state, had missed its necessary `currentCurrency` parameter.

This now passes it in wherever it's used.
2017-05-16 11:36:21 -07:00
Dan Finlay
19db11856b Remove redux dependency from eth-balance and its dependent tree
For better unit testability of the conf-tx view.
2017-05-12 12:44:51 -07:00
Thomas Huang
6bdb4c8728 Fix linting warnings 2017-04-26 21:05:45 -07:00
Kevin Serrano
088bfd5e8d
Fix account detail transition fix. 2017-04-05 13:38:33 -07:00
kumavis
067459da4c Filter txs by txMeta network value in account detail 2017-03-28 14:39:45 -07:00
Kevin Serrano
5d14925842
Fix styling of error message. 2017-03-22 16:54:10 -04:00
Frankie
ce0c3ed03c Merge branch 'dev' into messageManagerCleanUp 2017-02-01 12:03:42 -08:00
kumavis
f9b31fe2c3 rename selectedAccount to selectedAddress 2017-01-30 15:08:31 -08:00
Frankie
fdee1e3701 Merge branch 'dev' into messageManagerCleanUp 2017-01-28 22:59:28 -08:00
Frankie
8be68575bb Clean up message manger includes:
Provider egine bump
Remove presence of message manger in keyring controller
Change the status wording fom conf to approved
make Message manager a class
fix messages not being apart of the badge
re write message manger to better reflect controller pattern
2017-01-28 20:28:20 -08:00
kumavis
4dd6ba9c1b migration 5 - move keyring controller state to substate 2017-01-28 19:19:03 -08: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
9ed6381c5d Remove unused UI files 2017-01-17 16:31:12 -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
958cbfbde4 Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu 2017-01-17 13:58:54 -08:00
Dan Finlay
c05e04c611 Fix rendering of loose accounts 2016-12-23 17:23:33 -08:00
Dan Finlay
1f15499046 Show a "LOOSE" warning on accounts not belonging to HD Seed phrase 2016-12-22 17:17:20 -08:00
Dan Finlay
17d63acaed Fix camel casing on setSelectedAccount action. 2016-11-21 18:16:59 -08:00
Kevin Serrano
f5b0795ac5
change all instances of selectedAddress to selectedAccount. 2016-11-21 16:21:16 -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
Dan Finlay
bc623bbe34 Linted 2016-11-04 12:32:47 -07:00
Dan Finlay
19f7041ba4 Add account adding subview placeholders 2016-11-04 12:27:26 -07:00
Dan Finlay
1bbe0ed9e8 Scaffold new account view 2016-11-04 12:01:41 -07:00
Dan Finlay
e3fb7fa7bb Remove insane actions hash 2016-11-04 10:48:24 -07:00
Dan Finlay
6ec471c6dc Configure BIP44 Keychain as default one 2016-10-28 12:10:35 -07:00
Dan Finlay
55d56f77cf Began adding first basic keyring 2016-10-20 16:45:58 -07:00
Dan Finlay
1dc2612f8e Remove flex class from account list container 2016-10-11 15:59:55 -07:00
kumavis
c477411ce0 Merge branch 'library' of github.com:MetaMask/metamask-plugin into library 2016-09-13 00:37:41 -07:00
kumavis
8a5007a396 ui - remove unused currentDomain prop 2016-09-12 21:30:04 -07:00