7156 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
brunobar79	1494cc5e6c	fix merge conflicts	2018-07-01 11:41:34 -10:00
Dan J Miller	b2e64f24ec	Merge pull request #4687 from snreynolds/i4623-getConvertedCurrency ... fixes #4623	2018-06-29 17:03:09 -02:30
Dan J Miller	22debbfec8	Merge pull request #4640 from weijiekoh/develop ... Fix for #4639: display values of EIP712 typed boolean fields in the signing prompt	2018-06-29 17:00:51 -02:30
Sara Reynolds	ad6c454fd5	fixes #4623	2018-06-29 11:54:49 -07:00
Dan J Miller	f6238b2d39	Merge pull request #4647 from MetaMask/fix-overflow-currency-display ... Fix issues with scrollbar in currency display.	2018-06-29 16:06:29 -02:30
Dan J Miller	464b97890d	Improve attribute syntax in send-amount-row.component.js	2018-06-29 15:44:30 -02:30
Dan Finlay	a1fb1b8d3e	Merge pull request #4690 from MetaMask/i4662-token-gas-estimate-ux ... Set base estimate for token sends to be updated once recipient address specified	2018-06-28 17:48:05 -10:00
Dan	d2845afd89	Remove input arrows for send screen amount row on firefox.	2018-06-28 21:45:04 -02:30
Dan	d5133fb429	Fix issues with scrollbar in currency display.	2018-06-28 21:45:04 -02:30
Thomas Huang	218f2e84db	Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-style ... Fix style of shapeshift screen in deposit modal.	2018-06-28 16:57:32 -07:00
Dan	696d626133	Set based estimate for token sends to be updated once recipient address specified.	2018-06-28 21:03:09 -02:30
Dan J Miller	9f5ee94b69	Merge pull request #4678 from MetaMask/e2e-beta-tests-upgrade ... E2e beta tests upgrade	2018-06-28 20:17:44 -02:30
Thomas Huang	db548adca7	Merge pull request #4674 from MetaMask/removeOnlyTests ... Remove .only on test	2018-06-28 13:26:29 -07:00
Dan	f824a2982a	Use supersonic instead of httpserver to serve local dapp (e2e beta tests)	2018-06-28 10:16:36 -02:30
Koh Wei Jie	f17d99f81c	Fixed lint error	2018-06-28 08:06:36 +08:00
Dan J Miller	08b69a0cb0	Merge pull request #4677 from MetaMask/customize-gas-loading-wait ... Only show the customize gas modal if the estimateGas call is not currently in flight.	2018-06-27 17:27:51 -02:30
Dan J Miller	1839ab5346	Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancements ... [new-ui] Improve ENS input errors and update ens validation on network change	2018-06-27 17:09:44 -02:30
Dan	8a96dc0c48	Turn off failing e2e beta assertion in firefox until bugs in webdriver/geckodriver are resolved.	2018-06-27 14:40:16 -02:30
Dan	0cdfbb4503	Update condition for backspace in customize gas step of token factory send test (e2e beta).	2018-06-27 13:50:44 -02:30
Dan	0b2db451ee	Update package-lock.json	2018-06-27 13:30:55 -02:30
Dan	bec3fa3dbf	Fix add existing token test (e2e beta tests).	2018-06-27 12:55:30 -02:30
Dan	669f2437c7	Switch to eth and back before asserting on token balance (e2e beta token tests).	2018-06-27 11:08:57 -02:30
Dan	9cc358a429	await all clicks in e2e beta tests.	2018-06-27 11:08:55 -02:30
Dan	12266b064e	Close popup window for e2e beta token factory send test.	2018-06-27 11:08:17 -02:30
Dan	a25f5483d8	Fix retype seed phrase button.	2018-06-27 11:08:17 -02:30
Dan	b029085fbe	Disable e2e beta assertion after first token addition because of firefox / webdriver bug.	2018-06-27 11:08:17 -02:30
Dan	6c8f4b2dea	Pass correct params to verboseReportOnFailure in beta e2e tests.	2018-06-27 11:08:17 -02:30
Dan	686d14f42d	Add timeouts to certain beta e2e driver.waits.	2018-06-27 11:08:17 -02:30
Dan	31bb8a0ab7	Add try catch to deal with false negative timeouts in beta e2e tests.	2018-06-27 11:08:17 -02:30
Dan	a6cb13422d	Wait for element text match in metamask-beta-ui e2e send token test	2018-06-27 11:08:17 -02:30
Dan	c343a12543	Use locally served dapp to test contract calls in e2e beta tests	2018-06-27 11:08:15 -02:30
Dan	c1aa193487	Add extra delay to e2e tests after remix page load.	2018-06-27 11:01:26 -02:30
Dan	f5d43404dc	Fix send token tests in beta ui e2e tests.	2018-06-27 11:01:26 -02:30
Dan	bdf9cd8e3a	Speed up page opening and fix timeout errors on remix page opening in beta e2e tests.	2018-06-27 11:01:26 -02:30
Dan	07970b7cfa	Add delay before regularly failing test.	2018-06-27 11:01:26 -02:30
Dan	b7e7209fe6	Fix element located bug in beta e2e contract method call test.	2018-06-27 11:01:26 -02:30
Dan	7d5531d3e8	Improve wait for buy modal render after first time flow in beta e2e tests.	2018-06-27 11:01:26 -02:30
Dan	a242668872	Only show the customize gas modal if the estimateGas call is not currently in flight.	2018-06-27 11:01:26 -02:30
Dan	b64292d92f	Update metamask-beta-ui e2e spec to fail on insufficient gas estimation.	2018-06-27 11:01:26 -02:30
Dan	309239afb4	Wait for locating of submit buttons before attempting to click in metamask.spec.js	2018-06-27 11:01:26 -02:30
Dan	13e0b42359	Update tests to accomodate token list menu additions.	2018-06-27 11:01:26 -02:30
Dan	cc61372260	Disable onbeforeunload alert on remix for contract integration tests.	2018-06-27 11:01:26 -02:30
Dan	bf32aeaef2	Adds test for hiding tokens.	2018-06-27 11:01:26 -02:30
Dan	797a3ee686	e2e beta tests for contract deployment and calling a contract method.	2018-06-27 11:01:25 -02:30
Dan	e293233c5e	Improve reliability of beta e2e tests by using webdriver apis to wait for certain dom elements.	2018-06-27 11:01:25 -02:30
Dan	1d8f257832	Add test for importing from private key to from-import-beta-ui.spec.js, and remove non-import related tests from that file.	2018-06-27 11:01:23 -02:30
Dan	9734e6ffb8	metamask-beta-ui.spec.js tests custom token send before searched token.	2018-06-27 11:00:42 -02:30
Dan	9cb15d44a0	Adds e2e tests for sending tokens from token factory.	2018-06-27 10:58:55 -02:30
Dan	67894ef2e2	Adds e2e tests for sending tokens within metamask.	2018-06-27 10:58:55 -02:30
Dan	f82e4439d0	Adds e2e tests for sending tokens from token factory.	2018-06-27 10:45:54 -02:30