kumavis
23c2b0b9a5
Merge pull request #1050 from MetaMask/fixConfTxBalanceLogic
...
Fix conf tx balance logic
2017-01-24 15:00:46 -08:00
Frankie
8ed657d5d5
fix base
2017-01-24 14:54:38 -08:00
Frankie
5811f2ab14
Merge pull request #1051 from MetaMask/hotfix1048
...
hotfix - addNewAccount - dont assume hd keyring position
2017-01-24 13:38:24 -08:00
kumavis
745fff0c80
hotfix - dont assume hd keyring position
2017-01-24 13:29:48 -08:00
Frankie
b2623510ae
Fix issue where ConfTx view lets you approve txs when the account has insufficient balance
2017-01-24 13:19:26 -08:00
Dan Finlay
9f1884145a
Merge branch 'dev' into i715-AddJsonImport
2017-01-18 17:24:12 -08:00
Dan Finlay
5d8a3dd99b
Add ability to import v3 JSON wallets
...
There is now a menu item labeled "JSON File" for importing, and it can digest either:
- v1 MyEtherWallet JSON files
- v3 Account files (used by Geth, Mist, and MyEtherWallet).
Fixes #715
2017-01-18 16:45:39 -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
0e01abdf71
Merge branch 'master' into Version-3.1.0
2017-01-18 12:25:35 -08:00
Frankie
e3650b336a
Merge branch 'master' into fixSignedVsSubmitted
2017-01-18 11:30:41 -08:00
Frankie
460cbb985f
Fix the dissplay for submitted transactions and the listner wating to hear when tx's were included in a block
2017-01-18 11:24:53 -08:00
Dan Finlay
3572708fda
Fix test to log out despite number of menu items
2017-01-17 16:49:08 -08:00
Dan Finlay
693aa50e7f
Remove outdated reference
2017-01-17 16:35:11 -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
77bd010543
Add "import account" menu item + template view
2017-01-17 13:47:30 -08:00
Dan Finlay
54c536e72c
Fix message signing UI rendering
...
[A recent PR](https://github.com/MetaMask/metamask-plugin/pull/1004 ) removed logic that rendered pending messages for approval.
This commit fixes that.
2017-01-16 23:59:25 -08:00
Dan Finlay
5dd5619e5d
Merge branch 'master' into dev
2017-01-16 10:55:32 -08:00
Frankie
6481f9ced4
Dont render conf-tx if their are no txParams to show
2017-01-14 22:59:05 -08:00
Frankie
b72987405e
remove orphaned comment
2017-01-13 11:30:58 -08:00
Frankie
c1656aff19
lint
2017-01-13 10:53:16 -08:00
Frankie
5ed52eed68
Clean up code
2017-01-13 10:44:22 -08:00
Frankie
34081c8cb2
Fix sorting and instances where something could be undefined
2017-01-11 17:02:57 -08:00
Frankie
f9efb0817d
Merge branch 'dev' into integrateTxManagerUI
2017-01-11 16:07:03 -08:00
Frankie
576e2ad64d
Fix wording and icon of failed txs
2017-01-11 15:44:21 -08:00
Dan Finlay
d87a7b2a76
Send update to UI when changing selected account
...
Fixes #981
2017-01-11 15:15:37 -08:00
Frankie
0fae263a9a
Take some of the tx Logic out of the UI and create a visble state for pending and unaproved transactions
2017-01-11 12:16:37 -08:00
Frankie
29060acb72
update coinbase info and view
2017-01-10 12:18:39 -08:00
Kevin Serrano
3a6159080e
quick typo fix.
2017-01-06 14:41:40 -08:00
Kevin Serrano
af61bb9065
Switch order of header and indicator.
2017-01-05 08:31:54 -08:00
Kevin Serrano
b8d312f8b9
Linting.
2017-01-04 15:04:51 -08:00
Kevin Serrano
a8a37e4d40
Make network somewhat more modular, add new network indicator.
2017-01-04 14:30:14 -08:00
Dan Finlay
2c2cdc4475
Convert more actions to new simple pattern
2017-01-03 11:33:15 -08:00
Dan Finlay
10c818abac
Restore missing line
2017-01-03 11:30:27 -08:00
Dan Finlay
013e6a608f
Corrected instances of showWarning to displayWarning
2017-01-03 11:03:25 -08:00
Dan Finlay
8b7b097034
Apply new pattern to repetitive functions
2017-01-03 10:42:09 -08:00
Dan Finlay
3ebf029c04
Update account list after adding account
...
Fixed by finally making a function generator for a pattern we use frequently, communicating to the background process.
Fixes #961
2017-01-03 10:39:34 -08:00
Dan Finlay
2dbbc0dce7
Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManager
2017-01-02 17:32:51 -08:00
Dan Finlay
c05e04c611
Fix rendering of loose accounts
2016-12-23 17:23:33 -08:00
Frankie
fa3e708f34
Merge branch 'dev' into TxManager
2016-12-23 12:48:36 -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
898e96fd6a
Merge pull request #948 from MetaMask/RecoverLostAccounts
...
Auto-Recover accounts lost to BIP44 derivation fix
2016-12-22 14:43:43 -08:00
Dan Finlay
d3b2698f34
Rename function to be an action
2016-12-22 14:09:10 -08:00
Frankie
6f7c23fd28
Merge branch 'dev' into TxManager
2016-12-21 14:31:07 -08:00
Frances Pangilinan
6e78494846
First pass at revision requests
2016-12-21 13:41:32 -08:00
Kevin Serrano
aea263a80d
Lint.
2016-12-20 16:45:22 -08:00
Kevin Serrano
572980402d
Validate URIs before entering them in.
2016-12-20 16:41:04 -08:00
Dan Finlay
11c1004a41
Linted
2016-12-20 16:07:24 -08:00
