10 Commits

Author	SHA1	Message	Date
frankiebee	b30499886f	test - check that #setTxStatusRejected removes transaction from history	2018-07-10 15:35:27 -07:00
frankiebee	28c509914b	Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into i#3896	2018-07-10 11:32:05 -07:00
brunobar79	4b398701c1	fix unit tests	2018-07-02 21:03:34 -04:00
brunobar79	c734e486a0	fix tests	2018-07-02 20:21:27 -04:00
brunobar79	0da41263ac	fix warning for unit tests	2018-07-02 20:12:50 -04:00
brunobar79	a8f745f9fe	eslint --fix .	2018-07-02 18:49:33 -04:00
frankiebee	94a4f99115	tests - fix cancle transaction test to better fit new behavior	2018-06-26 12:21:50 -07:00
frankiebee	7b1f57e05d	woops - remove .only ... Co-authored-by: @jennypollack	2018-06-25 15:18:01 -07:00
frankiebee	9b92ba4c47	trandsactions - remove rejected transactions from history	2018-06-25 15:07:54 -07:00
tmashuang	13ebb0b455	Moved loose some loose test files to sub folders	2018-05-21 05:59:26 -07:00