475 Commits

Author	SHA1	Message	Date
Chi Kei Chan	373f8b72d0	Merge branch 'master' into NewUI-flat	2017-12-06 21:13:29 -08:00
Dan	ec6c3c33bd	Merge branch 'master' into NewUI-flat-merge-with-master	2017-12-06 21:11:52 -08:00
Dan	3356c15d04	Add tests for exponential backoff code in _resubmitTx	2017-12-06 14:11:14 -03:30
Dan	af8fcb6777	Update resubmitPendingTxs tests.	2017-12-06 14:10:11 -03:30
Thomas Huang	cefe6cded6	Update to Enzyme 3.2.0	2017-11-25 18:37:12 -06:00
Dan Finlay	8dd0093184	Remove logs	2017-11-20 14:46:36 -08:00
Dan Finlay	764a5bac56	Get test passing	2017-11-20 14:44:12 -08:00
Dan Finlay	884f203564	Add failing test for #2577 Seed Phrase Bug	2017-11-20 14:15:00 -08:00
Chi Kei Chan	e61ba93194	Merge branch 'master' into merge-master	2017-11-15 12:03:13 -08:00
Dora E. Mondrian	41fea44af3	newUnaprovedTx => newUnapprovedTx ... This typo tripped me up when I was reading through the code and trying to understand what's going on.	2017-11-06 04:35:51 -08:00
Dan	b7653e8207	Get current NewUI-flat tests working.	2017-11-02 15:16:43 -07:00
Chi Kei Chan	7c20011023	Merge branch 'master' into NewUI-flat	2017-10-24 16:50:25 -07:00
Chi Kei Chan	996523c790	Fix unit test	2017-10-20 21:51:37 -07:00
Chi Kei Chan	c8c773d641	Merge branch 'NewUI-flat' into merge	2017-10-18 22:58:46 -07:00
kumavis	8da0d0b28a	Revert "NetworkController refactor for new EthClient interface"	2017-10-18 15:09:32 -07:00
Dan Finlay	06094c914b	Move etherscan link logic into module	2017-10-14 11:23:44 -04:00
kumavis	dcf10f3d75	nonce-tracker - use blockTracker directly	2017-10-11 18:33:36 -07:00
kumavis	0f8d7dacb1	network-controller - use obj-proxy for providerProxy	2017-10-10 17:26:44 -07:00
Kevin Serrano	d82d9215fb	Make modification	2017-10-09 13:02:52 -07:00
Kevin Serrano	c12d56063d	Fix to actually fail in earlier versions.	2017-10-09 13:01:58 -07:00
Kevin Serrano	6f0c0e8374	Add test to look for wei precision.	2017-10-09 12:12:54 -07:00
Frankie	4a4338c1f4	Merge pull request #2305 from MetaMask/nodeify ... nodeify - allow callback to be optional	2017-10-06 14:08:58 -07:00
kumavis	3b3120c5f8	nodeify - fix test	2017-10-06 13:16:44 -07:00
Dan Finlay	94513cae7b	Provide method for tx tracker to refer to all txs	2017-10-06 12:50:33 -07:00
Dan Finlay	a32d71e8ed	Add failing test for issue #2294	2017-10-06 12:29:27 -07:00
Chi Kei Chan	bd99bc2e88	Merge branch 'master' into NewUI-flat	2017-10-03 16:02:58 -07:00
kumavis	25a80932a6	pending tx tracker - test - expect warning event on resubmit failure	2017-10-02 15:20:18 -07:00
kumavis	a86f6d6d90	pending tx tracker - test - rename tests to match event name	2017-10-02 15:14:15 -07:00
kumavis	167ad729fd	Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes	2017-10-02 13:45:47 -07:00
kumavis	c9c0e6f674	tx state history - test - fix format of history entries	2017-10-02 13:43:26 -07:00
kumavis	d29b5f10ef	tx state history - fix bug where initial snapshot was mutated on updateTx	2017-10-02 13:14:42 -07:00
frankiebee	ac80eaca1f	pending-tx - dont check the balance to rebrodcast	2017-09-29 12:54:05 -07:00
Chi Kei Chan	5a1d50cd43	Merge branch 'master' into mmn	2017-09-27 22:32:07 -07:00
kumavis	cdf41c2857	Merge pull request #2124 from MetaMask/breakout-mascara ... require metamascara	2017-09-27 16:27:01 -07:00
kumavis	15b2823e54	Merge branch 'master' into new-currency-test	2017-09-27 16:04:51 -07:00
kumavis	ecf909e140	Merge pull request #2194 from MetaMask/network-controller-refactor ... Network controller refactor	2017-09-27 15:56:23 -07:00
kumavis	f2d9b75e94	network controller - refactor to use _setProvider	2017-09-27 14:44:13 -07:00
kumavis	4404dfc5d3	Merge branch 'master' into direct-block-tracker	2017-09-27 13:58:54 -07:00
kumavis	5bbea78306	Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3 ... Transaction controller refractor pt3	2017-09-27 13:57:04 -07:00
kumavis	b41aad6d1a	style - small whitespace nitpick	2017-09-27 12:33:46 -07:00
Dan Finlay	e72083f6e8	Merge branch 'master' into filter-fixes-moar	2017-09-27 10:57:02 -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
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	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
frankiebee	4f887c6a62	fix test	2017-09-26 13:44:45 -07:00
frankiebee	b654eb9b1f	wrap block tracker in events proxy	2017-09-26 13:38:27 -07:00