1085 Commits

Author	SHA1	Message	Date
brunobar79	8ee01f4e99	Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5	2018-09-05 16:26:09 -04:00
Esteban MIno	e743f44150	fix conflicts	2018-08-28 15:20:30 -03:00
Esteban MIno	3106374cc3	watchAsset small changes	2018-08-27 22:10:14 -03:00
Dan Miller	952edf695c	Revert changes to tx-list-items.json, and to mock getTransactionCount method in tx-list-items integration test.	2018-08-27 17:07:01 -02:30
Alexander Tseung	c0e97d1739	Fix tests	2018-08-23 19:19:48 -07:00
Alexander Tseung	2d76ee754b	Reduce large timeouts	2018-08-23 16:45:28 -07:00
Alexander Tseung	bdfd54ec54	Increase e2e timeouts for firefox	2018-08-23 16:45:28 -07:00
Alexander Tseung	eb17151ff4	Change "Outgoing" to "Sent Ether" or "Sent Token"	2018-08-23 16:45:28 -07:00
Alexander Tseung	c06a0be486	Fix Firefox e2e tests	2018-08-23 16:45:28 -07:00
Alexander Tseung	62e2d5e01c	Fix integration tests	2018-08-23 16:45:28 -07:00
Alexander Tseung	6670bc0e09	Fix e2e tests	2018-08-23 16:45:27 -07:00
Alexander Tseung	a430eed2d8	Fix integration tests	2018-08-23 16:45:27 -07:00
Alexander Tseung	5dcd8ceb7b	Fix e2e tests	2018-08-23 16:45:27 -07:00
Alexander Tseung	9adf0c4b60	Fix integration tests	2018-08-23 16:45:27 -07:00
Alexander Tseung	c9ec5ed38d	Fix e2e tests	2018-08-23 16:45:27 -07:00
Alexander Tseung	13c4ecd610	Fix tests	2018-08-23 16:45:27 -07:00
Esteban MIno	b59a1e91b8	typo watchAsset imageUrl to image	2018-08-23 15:54:40 -03:00
Evgeniy Filatov	b23cca1469	implemented improvements to RPC history	2018-08-23 01:18:13 +03:00
Alexander Tseung	01c0c98501	Add tabs support for PageContainer	2018-08-22 14:12:01 -07:00
Whymarrh Whitby	171f6711d9	Merge pull request #5066 from whymarrh/fix-key-export ... Don't re-render the export modal when the selected identity changes	2018-08-22 16:28:17 -02:30
Whymarrh Whitby	e803b8e047	Add test cases for MetaMaskController#_onKeyringControllerUpdate	2018-08-22 15:38:34 -02:30
Alexander Tseung	7294aede4f	Add new variant for SenderToRecipient component	2018-08-22 10:53:20 -07:00
Esteban MIno	4e6c71e969	Merge branch 'develop' into WatchTokenFeature	2018-08-21 20:14:49 -03:00
Esteban MIno	6ccf2811e7	unit tests for watchAsset	2018-08-21 19:17:57 -03:00
brunobar79	90886c5e05	Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5	2018-08-21 15:58:29 -04:00
Dan J Miller	4704f3598e	Merge pull request #5108 from MetaMask/run-ganache-with-blocktime-flag ... Fix e2e tests: adapt ganache flags and remove unnecessary checks	2018-08-21 15:26:23 -02:30
Dan Miller	9bd0ce46e8	Remove unnecessary checks and user actions in metamask-beta-ui.spec	2018-08-21 14:45:27 -02:30
Dan Miller	1718b83d20	Run ganache with a blocktime flag for npm:run:ganache:start.	2018-08-21 13:47:42 -02:30
brunobar79	54021fd90b	fix unit tests	2018-08-21 00:09:54 -04:00
brunobar79	ab7eb73ecc	fix merge conflicts	2018-08-20 21:51:35 -04:00
Bruno Barbieri	bd904c86f6	Merge branch 'develop' into ledger-support	2018-08-17 13:45:46 -04:00
brunobar79	992e7f1b5a	fix merge conflicts	2018-08-17 12:56:07 -04:00
Dan Matthews	df799d7fd6	Restores accounts until one with a zero balance is found	2018-08-17 10:26:47 -04:00
brunobar79	b369560569	fix e2e tests	2018-08-16 20:59:11 -04:00
Dan Finlay	955ec2dca6	Merge pull request #4279 from MetaMask/network-remove-provider-engine ... Enhancement: New BlockTracker and Json-Rpc-Engine based Provider	2018-08-15 15:41:05 -07:00
brunobar79	fdf202efb0	fixed unit tests	2018-08-14 21:19:01 -04:00
Dan Miller	3c8a4162a4	Remove unnecessary else in test/e2e/beta/contract-test/contract.js	2018-08-14 19:18:04 -02:30
Dan Miller	ff72423491	Add explicit waits for submitted status for some txs initiated from test dapp.	2018-08-14 17:30:43 -02:30
Thomas	ce645561fb	Remove commented out code for detect-token-test	2018-08-14 12:29:57 -07:00
Dan Miller	c4fe6aa9cf	Reload e2e beta test browser if initial screen doesn't load.	2018-08-14 16:45:07 -02:30
Dan Miller	42256cfbd2	Increase timeout on wait for contract status update in metamask-beta-ui-spec	2018-08-14 16:28:04 -02:30
Thomas	9ffed5fd18	E2E - Dont error on browser errors	2018-08-14 11:29:43 -07:00
Thomas	96d789d2cf	Merge branch 'develop' into network-remove-provider-engine ... Override package-lock and fix merge conflicts	2018-08-14 10:44:42 -07:00
Dan Miller	a59e47e7b0	Add missing awaits and/or missing wait timeouts in test/e2e/beta/metamask-beta-ui.spec.js	2018-08-14 12:50:26 -02:30
Dan Miller	860bf42346	Make deployment states in test/e2e/beta/contract-test/contract.js more explicit	2018-08-14 12:35:50 -02:30
Dan Miller	c00d0daeb5	Improve error handling in assertElementNotPresent of test/e2e/beta/helpers.js	2018-08-14 12:35:50 -02:30
brunobar79	b77cc3d969	fix tx tests	2018-08-14 03:42:23 -04:00
Thomas	7918240833	Confirms new contract token in the popup	2018-08-13 10:31:07 -07:00
brunobar79	42834fe8be	fix e2e tests	2018-08-10 13:11:49 -04:00
Esteban MIno	d263d60b4c	tests for migration 28	2018-08-09 16:41:16 -04:00