13 Commits

Author	SHA1	Message	Date
kumavis	5be154ea20	controllers - transactions - merge @frankiebee's work with mine	2018-05-28 14:29:31 -07:00
kumavis	a0fe5b9190	test - unit - metamask-controller - remove log	2018-05-25 11:09:19 -07:00
kumavis	deab195772	test - unit - code style nitpick	2018-05-24 23:19:54 -07:00
kumavis	da5be0812a	test - unit - metamask-controller - fix many bugs in tests	2018-05-24 23:19:39 -07:00
kumavis	afdefc58e9	test - unit - tx-controller-test - add history object to txMeta when using internal calls	2018-05-24 22:41:09 -07:00
kumavis	630e2300f4	test - unit - move fetch polyfill to helper	2018-05-24 22:10:17 -07:00
kumavis	380964a687	test - unit - metamask-controller - polyfill global.fetch	2018-05-24 21:17:56 -07:00
kumavis	2b54d948da	test - remove .only from unit tests	2018-05-24 15:53:06 -07:00
frankiebee	61caee9d94	Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker	2018-05-22 16:45:20 -07:00
kumavis	3a80f3dd83	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine	2018-05-22 13:20:04 -07:00
tmashuang	238f2eb179	Merge branch 'develop' into testing	2018-05-21 16:36:48 -07:00
tmashuang	58b9afff4f	Merge branch 'develop' into testing	2018-05-21 14:57:57 -07:00
tmashuang	13ebb0b455	Moved loose some loose test files to sub folders	2018-05-21 05:59:26 -07:00