165 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
Dan J Miller	bd49098039	Merge pull request #5188 from taobun/develop ... edit decimal check in old-ui/	2018-09-04 21:39:01 -02:30
Dan Finlay	5043451356	Merge pull request #5167 from MetaMask/fix-watcAsset-images ... Fix images for watched tokens	2018-09-04 12:56:56 -07:00
bunoi	f412b19244	fix check valid decimals code in new ui	2018-09-04 23:40:02 +07:00
Dan J Miller	b9e4feac48	Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-data ... Adds feature flag toggle for the hex data row on the send screen.	2018-09-04 11:57:40 -02:30
Esteban MIno	07cb6adc31	fix images for watched tokens	2018-08-29 23:13:25 -03:00
Alexander Tseung	9ab0354e36	Merge pull request #5155 from MetaMask/i5154-confirm-spinner ... Fix infinite spinner on failed transactions	2018-08-28 17:37:13 -07:00
Alexander Tseung	f78dc96a2c	Fix infinite spinner on failed transactions	2018-08-28 12:18:57 -07:00
Esteban MIno	e743f44150	fix conflicts	2018-08-28 15:20:30 -03:00
Dan Miller	65873e33e4	Adds feature flag toggle for the hex data row on the send screen.	2018-08-27 11:44:16 -02:30
Alexander Tseung	342522c6cf	Fix naming, add eth.getCode check for actions, fix translations for statuses	2018-08-23 16:45:28 -07:00
Alexander Tseung	e104744d3b	Fix shapeshift transactions. Delete unused files	2018-08-23 16:45:27 -07:00
Alexander Tseung	5ee40675b9	Refactor transactions list views. Add redesign components	2018-08-23 16:44:44 -07:00
Alexander Tseung	4e0693eaff	Add withMethodData HOC, add higher-order-component folder	2018-08-23 16:44:43 -07:00
Alexander Tseung	d1de5ae94f	Add react-media package to prevent rendering wallet-view twice in the popup view	2018-08-23 16:44:43 -07:00
Alexander Tseung	3b408715c7	Refactor home screen and remove unused files	2018-08-23 16:44:43 -07:00
Esteban MIno	b59a1e91b8	typo watchAsset imageUrl to image	2018-08-23 15:54:40 -03:00
Alexander Tseung	25eac2334b	Merge pull request #5089 from MetaMask/i5085-ethcode ... Use eth_getCode to sort transaction action type	2018-08-22 14:48:37 -07:00
Alexander Tseung	865a0d8173	Use eth_getCode to sort transaction action type	2018-08-22 14:19:07 -07:00
Alexander Tseung	01c0c98501	Add tabs support for PageContainer	2018-08-22 14:12:01 -07:00
brunobar79	ab7eb73ecc	fix merge conflicts	2018-08-20 21:51:35 -04:00
Esteban MIno	81cd29df43	Merge branch 'develop' into WatchTokenFeature	2018-08-20 19:35:38 -03:00
brunobar79	51e4a6d335	fix ledger affiliate link	2018-08-16 21:15:50 -04:00
brunobar79	285814646f	ui ready	2018-08-16 20:41:23 -04:00
brunobar79	2ea05e303d	connect screen ready	2018-08-16 19:39:52 -04:00
Esteban MIno	bb868f5834	correct behavior when notification is closed when popup	2018-08-16 20:19:19 -03:00
Esteban MIno	2ace30bcd1	WIP	2018-08-16 18:28:07 -03:00
brunobar79	53dcad5a3b	more ui	2018-08-14 19:38:23 -04:00
brunobar79	19d1988715	fix	2018-08-14 19:24:15 -04:00
brunobar79	c72ced79ae	ui fixes	2018-08-14 19:22:00 -04:00
Esteban MIno	a4c3f6b65c	add support for images base64 and urls on new ui	2018-08-14 20:08:12 -03:00
brunobar79	b77cc3d969	fix tx tests	2018-08-14 03:42:23 -04:00
brunobar79	61a279204a	legacy and new hd path working	2018-08-14 01:26:18 -04:00
brunobar79	4e1d8ba19d	good progress adding paths	2018-08-13 19:29:43 -04:00
brunobar79	8e842a8947	able to add accounts	2018-08-11 05:02:02 -04:00
brunobar79	78a1cd3314	iframe communication working	2018-08-11 02:35:20 -04:00
brunobar79	5ef80495cf	refactor to support multiple hw wallets	2018-08-10 21:54:34 -04:00
brunobar79	eb2f491458	add error messages	2018-08-10 12:09:54 -04:00
Dan Miller	973325a6c4	Show error while allowing confirmation of transaction where simulation fails	2018-08-08 21:26:25 -02:30
Esteban MIno	33357e3538	refactor unused code	2018-08-07 19:12:16 -04:00
Esteban Miño	3f57d5f66b	Merge branch 'develop' into WatchTokenFeature	2018-08-07 17:50:58 -04:00
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	9ac9f53a73	eth_watchToken working	2018-08-03 19:24:12 -04:00
Esteban MIno	12dd7a7232	popup initializing with suggested tokens	2018-08-03 18:01:40 -04:00
Alexander Tseung	6d76d4e228	Disable Confirm button on subsequent clicks to prevent confirming multiple times	2018-08-03 14:44:57 -07:00
Esteban MIno	081884bd80	rpc-engine not crashing when eth_watchToken	2018-08-03 16:42:13 -04:00
Esteban MIno	21a61f2987	merge develop	2018-08-03 14:56:02 -04:00
Alexander Tseung	d0c901d081	Round large exponential numbers	2018-07-27 12:22:10 -07:00
Alexander Tseung	152246f3b0	Add close window support to signature requests. Move logic to actions	2018-07-23 20:25:04 -07:00