Commit Graph

4489 Commits

Author SHA1 Message Date
Dan 25c2865076 Restore notification functionality 2017-09-26 18:42:39 -07:00
frankiebee b05a6f89cb fix tests 2017-09-26 18:19:44 -07:00
frankiebee 36ddaf220d Merge branch 'transactionControllerRefractorPt3' of https://github.com/MetaMask/metamask-extension into transactionControllerRefractorPt3 2017-09-26 18:16:00 -07:00
frankiebee 508696f71d transactions: reveal #getFilteredTxList from txStateManage and fix accountTracker.store reference 2017-09-26 18:12:53 -07:00
frankiebee 80c98b1653 transactions: make evnt names pretty and eaiser to read 2017-09-26 16:55:11 -07:00
frankiebee 9fd5458112 transactions: lint fixes and reveal status-update event for balance controller 2017-09-26 16:54:04 -07:00
frankiebee 8ab23c713d Merge branch 'master' into transactionControllerRefractorPt3 2017-09-26 16:24:43 -07:00
Kevin Serrano 6ca519e97c Merge pull request #2183 from MetaMask/Fix2094
Fix 2094 related issues
2017-09-26 15:17:24 -07:00
Dan Finlay 651098c70d Remove duplicate instantiation of account-tracker 2017-09-26 14:30:29 -07:00
Dan Finlay 2eca5455c0 Move obs store into account-tracker instead of inheriting 2017-09-26 14:15:16 -07:00
kumavis ff5e8746be Merge pull request #2180 from MetaMask/proxy-blockTracker
Wrap block tracker in events proxy
2017-09-26 14:09:17 -07:00
frankiebee 9d1cb0f76d network contoller - clean up unused code 2017-09-26 13:56:09 -07:00
frankiebee 4f887c6a62 fix test 2017-09-26 13:44:45 -07:00
frankiebee 2ed8d579da listen for the blocke event on the block tracker instead of rawBlock on the provider 2017-09-26 13:38:27 -07:00
frankiebee b654eb9b1f wrap block tracker in events proxy 2017-09-26 13:38:27 -07:00
Dan Finlay 3bedcd3582 Restore blockGasLimit to account-tracker 2017-09-26 13:36:41 -07:00
Dan Finlay b1daa5ae26 Merge pull request #2094 from MetaMask/AddBalanceController
Calculate balance based on pending txs
2017-09-26 11:46:28 -07:00
Dan Finlay 9e3648c668 Pass blocktracker to balances controller 2017-09-26 11:33:36 -07:00
Thomas Huang d135c3c9ca Merge pull request #2174 from MetaMask/i2162-TokenPrecision
Fix token precision bug
2017-09-26 11:32:32 -07:00
Kevin Serrano accee14282
Remove old conversion list. 2017-09-26 10:35:13 -07:00
Kevin Serrano 7b199e215d
Polish names on currency list. 2017-09-26 10:11:18 -07:00
Kevin Serrano 88ddedfb5a
Account for undefined currencies. 2017-09-26 10:09:50 -07:00
Kevin Serrano 31e9dcf470
Modify tests for new API. 2017-09-26 10:02:49 -07:00
Kevin Serrano 16ba2e6a30
Merge branch 'master' into new-currency-test 2017-09-26 09:51:20 -07:00
kumavis 50633fbba6 Merge pull request #2170 from MetaMask/greenkeeper/sinon-4.0.0
Update sinon to the latest version 🚀
2017-09-26 09:49:12 -07:00
Dan Finlay 5d300f146a Add computed balance to mock state 2017-09-26 09:38:43 -07:00
Dan Finlay b46cb3ecb5 Fix token precision bug
Had fixed this before in the dependency, but hadn't merged in that version bump yet :(

Fixes #2162
2017-09-26 09:25:04 -07:00
Chi Kei Chan bdd1e58e55 Return null if transaction.key is shapeshift 2017-09-26 09:15:14 -07:00
Dan 7102772c3a Connect export key modal to state and enable actions. 2017-09-26 09:05:29 -07:00
greenkeeper[bot] e52d52b22e chore(package): update sinon to version 4.0.0 2017-09-26 08:22:48 +00:00
Chi Kei Chan d1737777f0 Merge pull request #2157 from danjm/MM-57-use-gas-estimator
[NewUI] Estimate gasPrice and gasLimit in send screen.
2017-09-25 19:56:12 -07:00
Chi Kei Chan 0d4433ed58 Merge branch 'NewUI-flat' into MM-57-use-gas-estimator 2017-09-25 19:55:56 -07:00
tmashuang ff6f7b52e4 Clean up transactionController tests 2017-09-25 19:47:03 -07:00
Dan 5f6ec6aa98 Remove unnecessary trailing comma. 2017-09-25 18:30:56 -07:00
Dan 56697ea9a4 Select all in to and from of send screens, instead of clearing on focus. 2017-09-25 18:30:56 -07:00
Dan eae40e0544 Able to change selections in to and from fields of send and send token. 2017-09-25 18:30:56 -07:00
Dan 2c474b0d6e Export private key modal body ui. 2017-09-25 18:29:43 -07:00
Dan fc3e071ad6 Send token now estimates gas and price. 2017-09-25 22:09:10 -02:30
Dan 79bcb88db3 Refactor to store estimated gas and price in local state, return promise from actions. 2017-09-25 21:54:55 -02:30
Dan 88c4226bf1 Estimate gasPrice and gasLimit in send screen. 2017-09-25 21:54:55 -02:30
Dan a1d87b821b Update send token to handle errors onBlur events and prevent clicking send until all errors handled 2017-09-25 21:45:51 -02:30
Dan 171d38c8db Handles errors with to field and renders warnings from backend in send token. 2017-09-25 21:19:30 -02:30
Dan Finlay 1968d61431 Make encryptor configurable for keyring-controller 2017-09-25 15:23:37 -07:00
Dan Finlay feed9a5a17 Add mock random value generator 2017-09-25 14:45:28 -07:00
Dan Finlay fd985e7ec1 Merge branch 'master' into AddBalanceController 2017-09-25 14:44:04 -07:00
Dan Finlay 674aac83ce Make blockTracker an independent param 2017-09-25 14:39:54 -07:00
Dan Finlay d9c92cdbd1 Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin into AddBalanceController 2017-09-25 14:37:11 -07:00
Dan Finlay 8cd7329c91 Implemented feedback 2017-09-25 14:36:49 -07:00
kumavis 9bbb0ca1ea Merge pull request #2143 from MetaMask/Version-3.10.3
Version 3.10.3
2017-09-25 12:55:45 -07:00
Dan Finlay dfbdb99858 Merge branch 'master' into AddBalanceController 2017-09-25 11:49:38 -07:00