446 Commits

Author	SHA1	Message	Date
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
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
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
Kevin Serrano	31e9dcf470	Modify tests for new API.	2017-09-26 10:02:49 -07:00
tmashuang	ff6f7b52e4	Clean up transactionController tests	2017-09-25 19:47:03 -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
Dan Finlay	dfbdb99858	Merge branch 'master' into AddBalanceController	2017-09-25 11:49:38 -07:00
tmashuang	20fea3f1de	Remove pending updateAndApprovedTransaction test	2017-09-25 10:47:36 -07:00
tmashuang	d4578836c9	Most of transaction controller tests	2017-09-22 16:15:18 -07:00
Dan Finlay	443b1a8eb7	Remove keyring controller from project	2017-09-22 14:38:40 -07:00
Dan Finlay	aa2abc00eb	Merge branch 'AddBalanceController' into BreakOutKeyringController	2017-09-22 14:30:31 -07:00
Dan Finlay	f128240e7f	Fix test references	2017-09-22 14:19:14 -07:00
Dan Finlay	e9043f22df	Allow custom encryptor to be passed to MetaMaskController and KeyringControllers.	2017-09-21 15:47:25 -07:00
frankiebee	4e57cdf8b3	stub platform	2017-09-19 11:34:19 -07:00
Dan Finlay	c9585f166f	Fix test	2017-09-13 15:21:18 -07:00
frankiebee	59909601b8	add test for pendingTxCount	2017-09-13 14:07:22 -07:00
Dan Finlay	53a467cd1e	Some progress	2017-09-12 15:06:19 -07:00
frankiebee	3ad67d1b14	match other controller patterns	2017-09-12 09:59:59 -07:00
Dan Finlay	4738746968	Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController	2017-09-11 15:19:17 -07:00
frankiebee	9b9df41724	more tests and craete a getPendingTransactions function	2017-09-08 14:24:40 -07:00
Dan Finlay	65c00e9fbb	Improve test name	2017-09-07 12:53:30 -07:00
Dan Finlay	532a4040de	Add test for computing gas price	2017-09-07 12:52:25 -07:00
Dan Finlay	c616581001	Remove logs	2017-09-07 12:47:52 -07:00
Dan Finlay	a95a3c7e4f	Fix balance calc test	2017-09-07 12:47:27 -07:00
Dan Finlay	7b92268428	Fix valueFor test	2017-09-07 12:43:10 -07:00
Dan Finlay	4058574436	Add basic test for valueFor	2017-09-07 12:30:25 -07:00
Dan Finlay	b6e8791bc2	test not passing	2017-09-07 11:59:15 -07:00