1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 12:56:01 +01:00
Commit Graph

884 Commits

Author SHA1 Message Date
Kevin Serrano
1ca6fff317
Display owned addresses in datalist. 2017-03-09 11:31:00 -08:00
Dan Finlay
42e4a0621b Add ENS click to copy
Also bump ethjs-ens version to get proper error for unregistered names.
2017-03-08 15:38:22 -08:00
Dan Finlay
e3f6c010ab Get basic ENS working
& merge master into ENS branch.
2017-03-08 15:19:33 -08:00
Kevin Serrano
6f980cfe10
Add more informative message 2017-03-08 10:46:17 -08:00
Kevin Serrano
21769a008c
Fix typo, switch to log.error 2017-03-08 09:35:31 -08:00
Kevin Serrano
0ee8ca178e
Remove unneeded setrpc method. 2017-03-08 09:08:28 -08:00
Kevin Serrano
cf2268c3d2
Nodeify and promisify calls to background. 2017-03-08 09:06:41 -08:00
Kevin Serrano
e7e024bcdd
Refactor of code into separate reducers and actions. 2017-03-07 16:01:51 -08:00
Kevin Serrano
08ca7dac5a
Merge branch 'master' into i1144-moarrpc 2017-03-07 10:37:31 -08:00
Kevin Serrano
2a98beb878
Break out rpc update and rpclist into two reducers. 2017-03-07 10:25:50 -08:00
Dan Finlay
26ea5993a9 Remove log 2017-03-06 15:36:16 -08:00
Dan Finlay
9bd8c5f723 Render personal_sign messages as utf-8 text
Calls to `personal_sign` are now:

- When hex encoded, preserved as hex encoded, but displayed as utf-8 text.
- When not hex encoded, decoded as utf-8 text as hex for signing.
- The messages proposed for signing are displayed as UTF-8 text.
- When the message cannot be rendered as UTF-8 text, it is displayed as hexadecimal.

Fixes #1173
2017-03-06 15:04:11 -08:00
Kevin Serrano
72932bdcba
Prevent submission of invalid gas parameters. 2017-03-01 17:03:55 -08:00
Kevin Serrano
0ac1f749fd
Various improvements to gas input. 2017-03-01 14:37:51 -08:00
Dan Finlay
5f378d382e Only allow numbers in gas inputs 2017-03-01 13:01:23 -08:00
Kevin Serrano
e66035254f
More conflict resolution. 2017-03-01 10:04:25 -08:00
Kevin Serrano
0a3849ec84
Fix merge conflicts. 2017-03-01 10:01:21 -08:00
Dan Finlay
69d4aafc3e Add ens recognition to send form input
Attempts to lookup `.eth` addresses on ENS.
Is currently failing.

I've written an isolation example of the problem here:
https://github.com/flyswatter/ens-test
2017-03-01 00:26:36 -08:00
Dan Finlay
6f598570d8 Fix loading indication for conf-tx view 2017-02-28 22:12:31 -08:00
Kevin Serrano
a600ccd4f8
Add reset button to reset gas fields. 2017-02-28 16:36:05 -08:00
Dan Finlay
af66e2b9ac Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits 2017-02-28 15:46:47 -08:00
Dan Finlay
ddc136a7c2 Add a couple more debug logs 2017-02-28 15:41:20 -08:00
Kevin Serrano
9bffe2d11a
Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits 2017-02-28 15:23:03 -08:00
Kevin Serrano
576cc9eb75
Gas and Gaslimit revert to default if set to 0 2017-02-28 15:21:48 -08:00
Dan Finlay
513a9d72ef Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits 2017-02-28 14:45:44 -08:00
Dan Finlay
f908aaafbc Use correct action to update and submit tx 2017-02-28 14:45:21 -08:00
Kevin Serrano
9fb4b4a77f
lints 2017-02-28 14:21:44 -08:00
Kevin Serrano
d21915c605
Remove advanced options for now. 2017-02-28 14:19:32 -08:00
Dan Finlay
39c824f2f3 Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits 2017-02-28 14:16:27 -08:00
Dan Finlay
e07e4b7bc7 Linted 2017-02-28 14:13:58 -08:00
Kevin Serrano
486583e203
lint 2017-02-28 14:12:50 -08:00
Dan Finlay
157dd994f0 Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits 2017-02-28 14:09:00 -08:00
Dan Finlay
da88481560 Remove gasMultiplier txMeta param
This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic.

Removed it and the logic that referred to this now-outdated parameter.
2017-02-28 14:08:00 -08:00
Kevin Serrano
acfb6ff0f8
Hide gas options behind an advanced options checkbox. 2017-02-28 14:07:19 -08:00
Kevin Serrano
6f2d14fde4
Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits 2017-02-28 12:06:46 -08:00
Dan Finlay
2e16e1eb94 Fixed bug that made send screen sometimes transition to account detail 2017-02-28 12:00:07 -08:00
Kevin Serrano
61a19a028b
Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits 2017-02-28 11:37:05 -08:00
Dan Finlay
45138af6c6 Fix infinite loop bug 2017-02-28 11:36:01 -08:00
Kevin Serrano
666044d417
Add margins to align. 2017-02-28 10:23:47 -08:00
Dan Finlay
04df5c1f2d Fix reference 2017-02-28 10:06:59 -08:00
Dan Finlay
0e817c9e7f Reorder rows for better table logic 2017-02-27 18:36:43 -08:00
Dan Finlay
3ddfdfff98 Emit updated tx values on accept click 2017-02-27 18:33:33 -08:00
Dan Finlay
2e80e8f722 Remove unused function 2017-02-27 18:26:18 -08:00
Dan Finlay
d844769c92 Add action for updating and approving a tx in one action 2017-02-27 18:26:04 -08:00
Dan Finlay
4370ca0cef Got gas live re-estimating 2017-02-27 18:19:05 -08:00
Kevin Serrano
2b0e939abd
Align input fields for gas. 2017-02-27 16:55:58 -08:00
Kevin Serrano
98e80e6740
Fix merge conflicts. 2017-02-27 16:35:25 -08:00
Kevin Serrano
5d1a4db5e5
Further styling to get hex component working. Fix some typos. 2017-02-27 16:33:58 -08:00
Dan Finlay
c4e9354575 Linted 2017-02-27 16:09:46 -08:00
Dan Finlay
57fec36a7d Add non-working gas recalculating logic to tx-details view 2017-02-27 16:06:28 -08:00
Kevin Serrano
9e6e3f55b7
Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits 2017-02-27 13:54:07 -08:00
Kevin Serrano
a77a5f0ab3
Move input boxes into table and into details component. 2017-02-27 13:53:43 -08:00
Dan Finlay
462c7ae213 Merge branch 'master' into i765-gaslimits 2017-02-27 12:59:19 -08:00
Dan Finlay
5edb3db969 Merge branch 'master' into i1144-moarrpc 2017-02-27 10:36:48 -08:00
Dan Finlay
ca5cf06ae9 Concatenate custom RPC labels that are too long 2017-02-27 10:25:10 -08:00
Kevin Serrano
dfc89d6c6d
Make gasPrice accessible to the UI. 2017-02-24 15:06:55 -08:00
Dan Finlay
42c2c3df37 Improve pending tx blue dot style 2017-02-23 17:45:37 -08:00
Dan Finlay
961a83769b Fix cancel msg signing behavior. 2017-02-23 16:02:58 -08:00
Dan Finlay
1d1d296a1e Make personal sign view look nice 2017-02-23 14:40:18 -08:00
Dan Finlay
4697aca02c Got personal_sign working
Also fixed bug where signing would not close popup.
2017-02-23 14:23:45 -08:00
Kevin Serrano
30e4bdf24b
Merge github.com:MetaMask/metamask-plugin into i765-gaslimits 2017-02-23 14:17:52 -08:00
Kevin Serrano
62854398f1
Tested against code to play nice with unit tests. 2017-02-23 13:56:58 -08:00
Dan Finlay
7ec25526b7 Add alternate UI for pending personal_sign messages 2017-02-23 11:18:49 -08:00
Dan Finlay
564f920ae0 Add personal sign actions and template 2017-02-22 16:30:09 -08:00
Kevin Serrano
3be6ee5f6c
Make the UI play nice with empty RPC lists. 2017-02-22 15:32:01 -08:00
Kevin Serrano
1d0f5fb51c
Linto 2017-02-22 15:13:59 -08:00
Kevin Serrano
7a0ce31bd3
Implemented functionality for displaying recent custom RPCs 2017-02-22 15:12:56 -08:00
Kevin Serrano
17a7436602
Connect to actions. 2017-02-21 12:51:56 -08:00
Dan Finlay
05080d1c50 Fix UI Dev Mode for Tx Approval
The state object had been changed, but our mock states for tx approval were using the old keys.

Rather than try to muck about and figure out each and every change, I've re-generated a UI dev state for tx approval, which should help @zanibas on his current project.

We can continue adding new dev states as needed from here.  If anyone catches a state that doesn't render correctly, it's worth checking if a new snapshot doesn't solve things.

Debugged by adding new debugging loggers, and I've left them in place for easier future debugging.
2017-02-20 23:33:21 -08:00
Dan Finlay
9e81a0c8c4 Merge branch 'master' into i1128-noticesdev 2017-02-20 15:42:20 -08:00
Kevin Serrano
e54b73679c
Notices must be scrolled down to proceed from. 2017-02-20 14:58:24 -08:00
Dan Finlay
8aca5bf4b5 Add debug logging to ui routing logic. 2017-02-20 13:14:12 -08:00
Kevin Serrano
415b9b245c
Fix typo. 2017-02-20 12:59:31 -08:00
Kevin Serrano
c934f96651
Re-enable notices on dev. 2017-02-20 12:59:12 -08:00
Dan Finlay
6b56d6ba98 Broke hex decimal input into its own component
Also added a new state to try to make UI dev mode work again, but it has other issues, like #1128, that need to be addressed before UI dev mode can be used again.
2017-02-17 12:46:08 -08:00
Kevin Serrano
89af0ef408
Change state to props, add modifiable fields. 2017-02-17 12:08:54 -08:00
Kevin Serrano
3fe8e2b659 Merge branch 'master' into i1089-networkfront 2017-02-15 15:44:14 -08:00
Kevin Serrano
9aa70fbaba
Remove custom RPC option when on lock screen. 2017-02-15 15:37:38 -08:00
Kevin Serrano
fbabcf6191
Change networks from lock screen. 2017-02-15 15:35:56 -08:00
Kevin Serrano
8f72748732
fix debug 2017-02-09 22:58:17 -08:00
Kevin Serrano
8b38719a7c
Prevent notices from opening in test and debug mode. 2017-02-09 22:55:14 -08:00
Kevin Serrano
65c84ac4b2
Delete all code related to disclaimers. 2017-02-09 18:17:50 -08:00
Frankie
de6455151e Revert old style message sighing 2017-02-09 17:32:49 -08:00
Dan Finlay
b529017149 Remove egregious alert 2017-02-06 16:45:40 -08:00
Dan Finlay
13ee92909c Mostly got shapeshift tx management into its own controller
Rendering the list is still having issues, so this isn't done yet.
2017-02-03 20:45:20 -08:00
kumavis
9e4ef45b6a migration #9 - break out CurrencyController substate 2017-02-02 23:32:24 -08:00
kumavis
99fa9ab13a migration 7 - break off TransactionManager substate 2017-02-02 20:20:13 -08:00
kumavis
296b278592 actions - dont expect background to provide newState, manually update 2017-02-02 16:46:56 -08:00
Frankie
54b1339f6a Merge branch 'dev' into messageManagerCleanUp 2017-02-01 13:05:58 -08:00
Frankie
6eb6057118 default a return of an empty array 2017-02-01 12:57:00 -08:00
Frankie
23622632c6 linting 2017-02-01 12:25:52 -08:00
Frankie
7aca279a5f fix transactions not showing up in history 2017-02-01 12:19:22 -08:00
Frankie
ce0c3ed03c Merge branch 'dev' into messageManagerCleanUp 2017-02-01 12:03:42 -08:00
Frankie
1b16b46241 code clan up and tests 2017-02-01 11:54:01 -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
kumavis
d7fde88f4b Merge branch 'dev' of github.com:MetaMask/metamask-plugin into kumavis-refactor2 2017-01-26 22:31:55 -08:00
kumavis
9ab8362843 metamask controller - cleanup remote api 2017-01-26 22:30:12 -08:00
Frankie
583dc100ab Fix ui overlap 2017-01-26 14:53:42 -08:00
kumavis
70b8e640f0 Merge branch 'dev' into i#1048 2017-01-24 15:39:33 -08:00
kumavis
463a56ff54 background controller - extract KeyringC.placeSeedWords to MetamaskC 2017-01-24 15:33:33 -08:00
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
Frankie
8642ced310 Fix issue where generating a new account would put it in loose keys 2017-01-24 12:06:59 -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