355 Commits

Author	SHA1	Message	Date
kumavis	78aa957e5a	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-07 10:52:08 -07:00
kumavis	5a9257208c	Merge branch 'master' into NewUI	2017-08-03 21:02:01 -07:00
kumavis	d526f68c8e	test - actions - tx - fix async test	2017-08-03 20:56:53 -07:00
kumavis	efb7543c6d	test - actions - remove commented code	2017-08-03 20:53:47 -07:00
kumavis	500e7d1f04	nodeify - test - syntax nitpick	2017-08-03 20:52:09 -07:00
frankiebee	b955b5a89a	add test for no callback error	2017-08-03 22:10:33 -04:00
frankiebee	a8966c4a4f	fix test	2017-08-03 22:02:31 -04:00
kumavis	e223b0c789	test - dont mix callback and promise	2017-08-03 16:34:38 -07:00
kumavis	da16f39626	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-03 15:05:32 -07:00
Kevin Serrano	81982d01c0	Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI	2017-08-03 13:10:46 -07:00
kumavis	8a9d0073b1	Merge pull request #1848 from MetaMask/transactionControllerRefractor ... Transaction controller refractor part 1: promises for everyone and more tests!	2017-08-02 19:57:16 -07:00
frankiebee	5ac4c2de6f	remove unused sinon	2017-08-02 19:11:51 -04:00
frankiebee	0808eb2256	fix test	2017-08-02 19:07:18 -04:00
frankiebee	b80c7e417b	move newUnapprovedTransaction to transactions.js	2017-08-02 18:59:34 -04:00
kumavis	8c6f01b910	blacklist controller - breakout from metamask and infura controllers	2017-08-02 15:54:59 -07:00
kumavis	ecaa235b5e	phishing detection - move phishing detection into contentscript and metamask controller	2017-08-02 14:26:10 -07:00
frankiebee	25cffd21f8	Merge branch 'master' into transactionControllerRefractor	2017-08-02 11:41:29 -04:00
frankiebee	21e76484d6	add test for addTxDefaults	2017-08-02 11:34:45 -04:00
frankiebee	432f516ab0	make addUnapprovedTransaction async function and use promise based ethQuery	2017-08-02 10:26:25 -04:00
kumavis	9eb13aee00	blacklist - add tests for metamask subdomains	2017-08-01 17:05:36 -07:00
kumavis	9d345e744d	blacklist - clearer test format	2017-08-01 16:58:40 -07:00
Dan Finlay	d932524eaf	Merge branch 'master' into NewUI	2017-07-27 15:24:10 -07:00
Dan Finlay	f8cadbcb32	Merge branch 'master' into NewUI	2017-07-27 15:10:02 -07:00
Dan Finlay	6675241fa9	Merge branch 'master' into i1805-LiveBlacklistUpdating	2017-07-26 16:46:59 -07:00
Kevin Serrano	6a9d40c558	Add test for blacklister.	2017-07-26 15:24:57 -07:00
kumavis	55a55141d0	nonce-tracker - fix test	2017-07-26 11:43:37 -07:00
kumavis	5ec73c0e65	tx cont - fix test to use async api	2017-07-25 14:39:17 -07:00
kumavis	4445ba1569	tx cont - add argument for provider constructor	2017-07-25 14:36:19 -07:00
Dan Finlay	a22adec66f	Replace ui with responsive-ui	2017-07-24 17:05:07 -07:00
Dan Finlay	a41e5788cf	Merge branch 'master' into NewUI	2017-07-20 12:39:06 -07:00
Dan Finlay	86d367957f	Move responsive ui into its own folder for easier merges	2017-07-20 12:38:38 -07:00
sdtsui	2adfce772c	Add new tests for dropdown component	2017-07-18 05:31:52 -07:00
Dan Finlay	614501e743	Fix transaction confirmation ordering ... Newest tx or message will now always appear last, and a new tx proposed after the user has a confirmation box open will never change the confirmation to a different tx proposed. Fixes #1637	2017-07-17 14:18:00 -07:00
tmashuang	a4c7d95d0d	Sinon stub infura network status	2017-07-14 13:06:42 -07:00
tmashuang	02cf65d513	Use Let instead of var	2017-07-14 11:50:41 -07:00
tmashuang	bda52f7cba	Infura Network response tests	2017-07-14 10:34:03 -07:00
frankiebee	7eccf5905a	make publishTransaction and signTransaction async methods	2017-07-13 15:25:43 -04:00
sdtsui	1507da139d	Add tests for new dropdown component	2017-07-13 00:40:22 -07:00
frankiebee	751103d948	Merge branch 'master' into nonce-tracker	2017-07-12 15:10:58 -07:00
frankiebee	aeefcbd75b	Fix test to match behavior	2017-07-12 15:10:52 -07:00
kumavis	23d44e5399	tests - disable infura test	2017-07-11 15:30:36 -07:00
frankiebee	971d25a8ab	Merge branch 'master' into nonce-tracker	2017-07-11 12:41:03 -07:00
Dan Finlay	c7b9e3fb18	Improve insufficient balance checking in retry loop	2017-07-11 12:19:01 -07:00
kumavis	f5de16c911	test - tx controller - fix promise handling	2017-07-07 14:32:03 -07:00
kumavis	ab8bae421e	test - tx-controller - stub block-tracker method	2017-07-07 14:26:52 -07:00
kumavis	d228f46254	Merge branch 'master' into nonce-tracker	2017-07-07 14:21:43 -07:00
Dan Finlay	07d4e4fe6f	Fix failing test	2017-07-05 23:24:33 -07:00
Dan Finlay	96df7ad8d3	Add missing done	2017-07-05 23:04:51 -07:00
Dan Finlay	ef1282b556	Typo fix	2017-07-05 22:48:11 -07:00
Dan Finlay	a915dfdeaa	Add failing test for retrying an over-spending tx	2017-07-05 22:36:52 -07:00