8630 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan J Miller	1ae668fa5e	Merge pull request #4995 from MetaMask/nonce-for-retry-from-ethquery ... Get nonce for showing retry button using ethQuery transaction count.	2018-08-08 21:09:27 -02:30
Whymarrh Whitby	51644962e9	Fix lint error in tx-list	2018-08-08 19:32:45 -02:30
brunobar79	d0ccc59e45	add comment	2018-08-08 15:42:25 -04:00
brunobar79	656afeefad	fix merge conflicts	2018-08-08 15:40:04 -04:00
Dan Miller	e98c3b4c01	Get nonce for showing retry button using ethQuery transaction count.	2018-08-08 17:04:42 -02:30
Dan J Miller	1d4ee6bf76	Merge pull request #4986 from MetaMask/approve-calc-token-decimals ... Use token decimals when calculating confirm screen token approval amount	2018-08-08 16:26:03 -02:30
brunobar79	de058c128f	update package-lock.json	2018-08-08 14:34:54 -04:00
brunobar79	286bde606f	fix merge conflicts	2018-08-08 14:30:49 -04:00
Paul Bouchon	8ac4b586eb	Update eth-keyring-controller and eth-hd-keyring versions (#4989)	2018-08-08 13:17:48 -04:00
brunobar79	f269021dc3	add submit button type	2018-08-08 12:22:48 -04:00
Bruno Barbieri	bb52985722	Merge pull request #4988 from MetaMask/remove-engine-restrictions ... Remove engine restrictions	2018-08-08 12:13:45 -04:00
brunobar79	a92e5ec527	remove engine restrictions	2018-08-08 11:46:54 -04:00
Dan Finlay	fdfcc7d687	Merge pull request #4982 from MetaMask/sig-version-fix ... Reestablish old versions of eth-keyring-controller and eth-hd-keyring	2018-08-08 08:26:49 -07:00
Dan Miller	c4f1dfb82e	Use token decimals when calculating confirm screen amount for token approvals.	2018-08-08 12:36:59 -02:30
bitpshr	365e349ec4	Reestablish old versions of eth-keyring-controller and eth-hd-keyring	2018-08-08 08:17:16 -04:00
brunobar79	cbbd0d3c75	lint	2018-08-08 03:21:37 -04:00
brunobar79	a46cf39f9b	update package-lock.json	2018-08-08 03:03:17 -04:00
brunobar79	c6b7e460b5	code review changes	2018-08-08 03:00:39 -04:00
brunobar79	2e0916d8ff	fix merge conflicts	2018-08-08 02:32:35 -04:00
Justin Kat	aab6e366c5	Fixing translations in first-time init menu (#4969)	2018-08-07 23:27:52 -02:30
Esteban MIno	c245405acb	show token address summary on old ui	2018-08-07 20:07:26 -04:00
Esteban MIno	33357e3538	refactor unused code	2018-08-07 19:12:16 -04:00
Esteban MIno	15ea8c04b2	fix merge	2018-08-07 17:53:36 -04:00
Esteban Miño	3f57d5f66b	Merge branch 'develop' into WatchTokenFeature	2018-08-07 17:50:58 -04:00
Esteban MIno	00d1f6fec5	watch token on old ui	2018-08-07 17:40:45 -04:00
Dan Finlay	e9f74f005d	Merge pull request #4884 from MetaMask/TokensPerAccountBasis ... Tokens per account & network basis	2018-08-07 13:30:26 -07:00
Thomas	562764ccb2	Use develop e2e beta tests	2018-08-07 12:07:22 -07:00
Dan Finlay	0601df9dae	Merge pull request #4954 from MetaMask/v4.9.0 ... V4.9.0	2018-08-07 11:31:42 -07:00
Esteban MIno	66c76c04ef	CHANGELOG	2018-08-07 14:25:21 -04:00
Esteban MIno	b3af9cdf2e	Merge branch 'develop' into TokensPerAccountBasis	2018-08-07 14:20:49 -04:00
Dan Finlay	d549c4b871	Merge pull request #4965 from MetaMask/4.9.0 ... Update CHANGELOG.md	2018-08-07 11:20:09 -07:00
Esteban MIno	c0cdda8321	Merge branch 'develop' into TokensPerAccountBasis	2018-08-07 14:17:40 -04:00
Esteban MIno	1f8a808a00	wip watch token old ui	2018-08-07 14:16:54 -04:00
frankiebee	2df46c1392	Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/metamask-extension into network-remove-provider-engine	2018-08-07 11:16:04 -07:00
frankiebee	ff53a33f81	lint fixes	2018-08-07 11:14:56 -07:00
Kevin Serrano	bb40a8169c	Update CHANGELOG.md	2018-08-07 10:05:05 -07:00
frankiebee	e8a8711854	deps - update package-lock	2018-08-07 02:25:53 -07:00
frankiebee	cbade51ebd	Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into network-remove-provider-engine-tests	2018-08-07 01:53:13 -07:00
frankiebee	115d3c9aaf	Merge branch 'network-remove-provider-engine' into network-remove-provider-engine-tests	2018-08-07 01:38:32 -07:00
frankiebee	c2d4b237eb	network - fix blockTracker reference to return the blockTrackerProxy instead of the direct blockTracker reference	2018-08-07 01:35:30 -07:00
Whymarrh Whitby	564fb9f563	Merge pull request #4960 from whymarrh/import-account-error ... Show invalid seed phrase error when importing new account	2018-08-07 02:37:14 -02:30
Whymarrh Whitby	d0611741a2	Show invalid seed phrase error when importing new account	2018-08-07 02:09:26 -02:30
Esteban MIno	a57f56fdca	clean confirm add token component	2018-08-06 20:06:13 -04:00
Esteban MIno	af35b415ab	new confirm add suggested token component	2018-08-06 20:03:49 -04:00
Esteban MIno	88933f3a66	fix duplicated action	2018-08-06 18:48:18 -04:00
Esteban MIno	78ad3c38e2	add suggested token params validation	2018-08-06 18:28:47 -04:00
Thomas	f6490a2a6e	Bump Changelog	2018-08-06 13:32:25 -07:00
Thomas	845a1a3df2	v4.9.0 Release	2018-08-06 13:09:07 -07:00
Thomas	941a920b15	Update Changelog	2018-08-06 13:08:40 -07:00
Whymarrh Whitby	7325ccf0fe	Merge pull request #4951 from whymarrh/update-pkgs ... Update e2e test packages 📦	2018-08-06 16:22:04 -02:30