aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/accounts
Commit message (Collapse)AuthorAgeFilesLines
* Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-171-1/+1
|
* Fix merge conflictsAlexander Tseung2018-03-311-4/+10
|\
| * Removes t from props via metamask-connect and instead places it on context ↵Dan2018-03-296-35/+69
| | | | | | | | via a provider.
* | Fix i18n merge conflictsAlexander Tseung2018-03-301-5/+4
|\|
| * Merge branch 'master' into i18n-translator-reduxDan2018-03-273-6/+6
| |\
| * | Correct proptypes for t in new-account/create-form.jsDan2018-03-221-1/+1
| | |
| * | Lint fixesDan2018-03-223-5/+3
| | |
| * | Fix references to undefined 'this.props'Dan2018-03-221-12/+10
| | |
| * | i18n redux solution doesn't require importing t() and passing state to each ↵Dan2018-03-226-33/+27
| | | | | | | | | | | | t() call; t is just available on props.
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-03-212-4/+4
| |\ \ | | | | | | | | | | | | i18n-translator-redux
| * | | Lint fixes.Dan2018-03-203-0/+3
| | | |
| * | | Handle i18n with redux.Dan2018-03-166-34/+34
| | | |
| * | | i18n - load locales manuallykumavis2018-03-156-13/+12
| | | |
* | | | Fix merge conflictsAlexander Tseung2018-03-271-0/+82
|\ \ \ \ | | |_|/ | |/| |
| * | | Update button stylesAlexander Tseung2018-03-263-7/+7
| | |/ | |/|
| * | i18n Import flowThomas2018-03-212-5/+5
| |/
| * Fix translations whose substitutions params were not in arrays.Dan2018-03-141-1/+1
| |
| * Add i18n back into JsonImportSubviewThomas2018-03-121-7/+7
| |
| * Merge branch 'master' into i18nThomas Huang2018-03-121-78/+102
| |\
| | * Explicitly define state in import account from json component (#3491)Alexander Tseung2018-03-091-78/+102
| | |
| * | Merge branch 'master' into i18nDan Finlay2018-03-071-0/+15
| |\|
| | * Import Account disclaimerThomas2018-03-031-9/+2
| | |
| | * Add import account disclaimerThomas2018-02-281-0/+22
| | |
| * | Correct merge conflict resolution errors.Dan2018-03-071-2/+0
| | |
| * | Merge branch 'master' into i18nDan2018-03-074-12/+28
| |\|
| | * Merge branch 'uat' into uat-nextDan2018-02-081-0/+6
| | |\
| | | * Merge branch 'master' into uatDan2018-02-081-0/+6
| | | |\
| | | | * Add warning when importing no valid fileDan Finlay2018-01-311-0/+6
| | | | | | | | | | | | | | | | | | | | Fixes #3089
| | * | | [NewUI] Updates capitalization and alignment for the import account screen. ↵Dan J Miller2018-02-012-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#3122) * Updates capitalization and alignment for the import account screen. * Align elements in import form.
| | * | | [NewUI] Set default new account name as placeholder, but not value (#3121)Dan J Miller2018-02-011-5/+8
| | |/ / | | | | | | | | | | | | | | | | | | | | * 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.
| * | | complete i18n across new UINick Doiron2018-01-304-16/+17
| | | |
| * | | separate out cross-browser i18n for extensionsNick Doiron2018-01-255-0/+5
| | | |
| * | | better organization of locale file; i18n in more view filesNick Doiron2018-01-245-21/+20
| |/ /
* | | Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-013-257/+0
| | |
* | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-303-29/+182
|\| |
| * | Fix input box padding and select highlight in new account create and import ↵Dan2018-01-131-1/+0
| | | | | | | | | | | | page.
| * | New add account page with create and import options.Dan2018-01-135-77/+236
| | |
* | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-153-201/+0
|/ /
* | Merge branch 'master' into merge-masterChi Kei Chan2017-11-161-0/+1
|\|
| * Remove warning message when show import pageDaijiro Wachi2017-10-311-0/+1
| | | | | | | | Fixes: https://github.com/MetaMask/metamask-extension/issues/1192
* | Clear import error state on logout.Dan2017-10-271-0/+4
| |
* | Update Import Account Help LinkChi Kei Chan2017-10-251-1/+1
| |
* | New Account modalChi Kei Chan2017-10-181-0/+1
| |
* | Fix SELECT TYPE dropdown changing sizes based on error message (#2359)Alexander Tseung2017-10-141-2/+4
|/
* Replace ui with responsive-uiDan Finlay2017-07-252-255/+0
|
* Move responsive ui into its own folder for easier mergesDan Finlay2017-07-216-0/+552
|
* Make folder for responsive UIDan Finlay2017-07-046-552/+0
|
* Add Back Button for Import ScreenThomas Huang2017-06-281-0/+9
|
* Add a new warning for file import JSONKevin Serrano2017-06-151-0/+3
|
* Fix fiat renderingDan Finlay2017-05-172-2/+6
| | | | | | | | 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.
* Remove redux dependency from eth-balance and its dependent treeDan Finlay2017-05-132-2/+5
| | | | For better unit testability of the conf-tx view.
* Fix linting warningsThomas Huang2017-04-271-1/+1
|
* Fix account detail transition fix.Kevin Serrano2017-04-061-1/+1
|
* Filter txs by txMeta network value in account detailkumavis2017-03-291-1/+1
|
* Fix styling of error message.Kevin Serrano2017-03-232-4/+2
|
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-022-11/+4
|\
| * rename selectedAccount to selectedAddresskumavis2017-01-312-11/+4
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-291-2/+3
|\|
| * migration 5 - move keyring controller state to substatekumavis2017-01-291-2/+3
| |
* | Clean up message manger includes:Frankie2017-01-291-5/+5
|/ | | | | | | | | 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
* Implement naieve JSON file importingDan Finlay2017-01-192-5/+76
| | | | 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.
* Added new modular private key import systemDan Finlay2017-01-191-2/+1
| | | | | | | | | | | | | | 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!
* Remove unused UI filesDan Finlay2017-01-182-109/+0
|
* Allow importing of private key stringsDan Finlay2017-01-183-7/+86
| | | | | | | | 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`.
* Merge branch 'i328-MultiVault-v1' into i715-AddImportMenuDan Finlay2017-01-186-0/+255
|\
| * Develop import subviewsDan Finlay2016-11-054-16/+85
| |
| * Add import account placeholder templateDan Finlay2016-11-052-30/+70
| |
| * LintedDan Finlay2016-11-051-6/+3
| |
| * Add account adding subview placeholdersDan Finlay2016-11-053-37/+119
| |
| * Scaffold new account viewDan Finlay2016-11-052-1/+61
| |
* | Fix rendering of loose accountsDan Finlay2016-12-241-2/+2
| |
* | Show a "LOOSE" warning on accounts not belonging to HD Seed phraseDan Finlay2016-12-232-7/+25
| |
* | Fix camel casing on setSelectedAccount action.Dan Finlay2016-11-221-1/+1
| |
* | change all instances of selectedAddress to selectedAccount.Kevin Serrano2016-11-222-5/+5
|/
* Remove insane actions hashDan Finlay2016-11-051-6/+2
|
* Configure BIP44 Keychain as default oneDan Finlay2016-10-291-3/+3
|
* Began adding first basic keyringDan Finlay2016-10-211-3/+3
|
* Remove flex class from account list containerDan Finlay2016-10-121-1/+1
|
* Merge branch 'library' of github.com:MetaMask/metamask-plugin into librarykumavis2016-09-132-10/+7
|\
| * Fix single account list formattingDan Finlay2016-09-132-5/+2
| |
| * Add accounts back to metamask stateDan Finlay2016-09-131-5/+5
| |
* | ui - remove unused currentDomain propkumavis2016-09-131-1/+0
|/
* Revert "Add new eth-lightwallet salting to vault."Frankie2016-09-132-7/+10
|
* Fix account list formatting when only a single item.Dan Finlay2016-09-122-10/+7
| | | | | | - Makes account list items no longer flex larger than they should be. - Makes the add account button not flex larger than it should be. - Adds a line under the add account button to define its size.
* Merge branch 'master' into i#589pendingTxsIssueFrankie2016-09-091-2/+2
|\
| * Nearly finished factoring fiat value into eth-balanceDan Finlay2016-09-071-2/+2
| |
* | Add network checks for unconfirmed TxsFrankie2016-09-091-0/+1
|/
* Change account list balance rendering.Kevin Serrano2016-08-171-2/+6
|
* Add mock dev modeDan Finlay2016-07-221-2/+1
|
* Replace manual copy buttons with new CopyButton componentDan Finlay2016-06-301-9/+3
|
* Add alt titles to most critical iconsKevin Serrano2016-06-281-0/+1
| | | | We can change most of these later to a more "elegant" solution, but from the user perspective, having these tooltips is comforting imo.
* accounts - rename account list item so it doesnt overlapkumavis2016-06-242-2/+3
|
* Fix for lint errFrankie2016-06-221-6/+0
|
* Fix conflictFrankie2016-06-222-59/+56
|\
| * Manually lintedDan Finlay2016-06-222-3/+0
| |
| * Auto lintedDan Finlay2016-06-222-57/+54
| |
* | Change the copy to cliboard iconFrankie2016-06-221-2/+6
|/
* Let account address take more space in account listDan Finlay2016-06-151-6/+18
|
* Change chevron-down to fa-plusFrankie2016-06-041-1/+1
|
* Add number indicating pending txs to account listDan Finlay2016-05-262-0/+23
|
* Add copy address button to account listDan Finlay2016-05-242-6/+47
|
* Move account list panel to componentDan Finlay2016-05-242-45/+28
|
* Move accounts indexDan Finlay2016-05-241-0/+182