Commit Graph

2098 Commits

Author SHA1 Message Date
kumavis 4c1b7700ad Merge branch 'dev' into TearDownOnDisconnect 2017-01-05 14:25:31 -05:00
Dan Finlay 3727cad0c4 Merge pull request #967 from MetaMask/fixTxManager
Fix tx manager
2017-01-05 11:22:15 -08:00
kumavis 00ac5ca058 Merge branch 'dev' into TearDownOnDisconnect 2017-01-05 14:18:34 -05:00
Dan Finlay 73ee0ae766 Merge branch 'dev' into fixTxManager 2017-01-05 11:18:13 -08:00
Kevin Serrano 70816d7cb0 Merge pull request #969 from MetaMask/i945-AlwaysQueryLatest
Always query latest block for balance & nonce
2017-01-05 11:08:57 -08:00
Frankie e62f70660d MetaMask Controller - Convert to EventEmitter 2017-01-05 11:06:18 -08:00
Dan Finlay 7659f5894a Combine two identical then blocks 2017-01-05 11:03:30 -08:00
Kevin Serrano af61bb9065
Switch order of header and indicator. 2017-01-05 08:31:54 -08:00
Kevin Serrano b9a365a8f2
Changelog. 2017-01-04 15:08:39 -08:00
Kevin Serrano b8d312f8b9
Linting. 2017-01-04 15:04:51 -08:00
Frankie cf6817092b remove unnecessary try statments 2017-01-04 15:03:45 -08:00
Dan Finlay 6c99d09404 Fixed bugs with sanity-checking
- Was incorrectly calling some eth-query methods (left over from old local eth-query)
- Was still passing block to getAccount in addAccount
- Now emitting update only after all account balances are loaded, reducing UI update traffic.
2017-01-04 14:54:40 -08:00
Kevin Serrano a8a37e4d40
Make network somewhat more modular, add new network indicator. 2017-01-04 14:30:14 -08:00
Dan Finlay ead8a05034 Fix dependency reference 2017-01-04 14:21:36 -08:00
Dan Finlay a107b66854 Caught typo 2017-01-04 14:15:53 -08:00
Dan Finlay 18e6d266c1 Add descriptive comment 2017-01-04 14:07:08 -08:00
Frankie 4b17222a59 Merge branch 'TxManager' into fixTxManager 2017-01-04 14:06:49 -08:00
Dan Finlay 381a60695d Linted 2017-01-04 14:05:00 -08:00
Dan Finlay 0fab22082a Bump changelog 2017-01-04 14:02:13 -08:00
Dan Finlay d4958b7ffd Remove old eth-store dependency 2017-01-04 14:01:43 -08:00
Dan Finlay 3588aabdf2 Removed reliance on eth-store internal custom eth-query 2017-01-04 14:01:32 -08:00
Dan Finlay 08351f801a Move eth-store@1.1.0 into local repo. 2017-01-04 13:56:21 -08:00
Frankie f50e983500 Merge branch 'TxManager' of https://github.com/MetaMask/metamask-plugin into TxManager 2017-01-04 13:53:54 -08:00
Frankie 32e8063a77 clean up 2017-01-04 13:13:34 -08:00
Frankie 354fa763d4 Merge branch 'dev' into fixtTxManager 2017-01-04 13:05:29 -08:00
Frankie e6da8e2762 Fix signing of transactions 2017-01-04 13:04:33 -08:00
Dan Finlay c22da8450c Merge pull request #965 from MetaMask/chrome-permissions
Chrome permissions
2017-01-03 13:21:13 -08:00
Kevin Serrano b571913daf
Merge branch 'dev' of github.com:MetaMask/metamask-plugin into dev 2017-01-03 12:19:33 -08:00
Kevin Serrano 0ba63e0ead Merge pull request #964 from MetaMask/i963-BalancesNotUpdating
Update UI state on ethStore updates
2017-01-03 12:19:26 -08:00
Kevin Serrano 0a6d8af171 Merge branch 'dev' into i963-BalancesNotUpdating 2017-01-03 12:07:38 -08:00
Kevin Serrano 1a16057857
Merge branch 'dev' of github.com:MetaMask/metamask-plugin into dev 2017-01-03 11:41:34 -08:00
Kevin Serrano 74cccb4f1d Merge pull request #962 from MetaMask/i961-UpdateUiBug
Fix AddAccount not updating UI
2017-01-03 11:41:26 -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
Kevin Serrano 3363a38bfc
Changelog. 2017-01-03 11:26:19 -08:00
Kevin Serrano 68e27e6193
Changelog. 2017-01-03 11:24:03 -08:00
Kevin Serrano 68be524019
Take out unneeded permissions from the app. 2017-01-03 11:23:27 -08:00
Dan Finlay 33b4d213f1 Fix sendUpdate for new promisified getState method 2017-01-03 11:15:38 -08:00
Dan Finlay 1b9906372b Update UI state on ethStore updates
UI was remarkably not relying on ethStore for updates, so things like account balances were frozen until user activity.

Fixes #963
2017-01-03 11:10:20 -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
Kevin Serrano b13c54682b Merge pull request #958 from MetaMask/i897-ReplayProtection
Add replay protection
2017-01-03 09:28:53 -08:00
Dan Finlay fe61fcb0fc Merge branch 'dev' into i897-ReplayProtection 2017-01-02 17:49:04 -08:00
Dan Finlay b93cdd428b Merge remote-tracking branch 'origin/ShowDifferentAccounts' into RevertTxManager 2017-01-02 17:38:37 -08:00
Dan Finlay 6b8db04f0f Merge remote-tracking branch 'origin/i727-provider-is-metamask' into RevertTxManager 2017-01-02 17:34:35 -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 305cda4265 Use chainId parameter instead of second argument 2017-01-02 15:31:05 -08:00
Dan Finlay af2c7004b0 Make single letter variables more verbose 2017-01-02 15:08:18 -08:00
Dan Finlay 7320095079 Linted 2017-01-02 14:54:31 -08:00