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

4551 Commits

Author SHA1 Message Date
Dan Finlay
828dbd7e3f Merge pull request #2155 from MetaMask/filter-fixes-moar
Various fixes you've been waiting for, how exciting!
2017-09-27 11:13:06 -07:00
Dan Finlay
e72083f6e8 Merge branch 'master' into filter-fixes-moar 2017-09-27 10:57:02 -07:00
kumavis
ca0dff06f5 Merge pull request #2153 from MetaMask/BreakOutKeyringController
Break out keyring controller into separate module
2017-09-27 10:44:52 -07:00
frankiebee
0a94ec41d3 pending-tx - move incrementing of the retryCount on the txMeta outside pending-tx-tracker 2017-09-26 22:42:59 -07:00
kumavis
1877c0766c Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController 2017-09-26 21:42:30 -07:00
Chi Kei Chan
c77029ea90 Implement Confirm Deploy Contract screen 2017-09-26 19:21:04 -07:00
Dan
39365f2cc4 Update the correct values in state when estimates are received. 2017-09-26 18:43:26 -07:00
Dan
541b69dda9 Gets gas and price estimates when send components mount. 2017-09-26 18:43:26 -07:00
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
e998d528f0 Merge branch 'master' into RemoveSlackLink 2017-09-26 15:47:31 -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
Dan Finlay
57b5f15265 Remove slack link 2017-09-26 10:01:16 -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