1547 Commits

Author	SHA1	Message	Date
Esteban MIno	81cd29df43	Merge branch 'develop' into WatchTokenFeature	2018-08-20 19:35:38 -03:00
Alexander Tseung	cec87a5b2c	Update logo wordmark	2018-08-18 20:46:56 -07: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
Esteban MIno	dbab9a007f	delete according image when token added with watchToken deleted	2018-08-16 21:17:02 -03: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
Esteban MIno	a36ea0e232	show watch asset image from hide token modal	2018-08-16 12:04:43 -03:00
Esteban MIno	b766104c8d	add suggested tokens objects in metamask state	2018-08-15 18:34:57 -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	aa6a42e3de	rename keyring	2018-08-11 05:11:21 -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
Bruno Barbieri	e2be22a4b7	Merge pull request #4897 from MetaMask/qr-code-scan ... QR Code Scanner	2018-08-10 13:40:06 -04:00
Dan J Miller	d4af5b7bec	Merge pull request #5000 from MetaMask/contract-method-conf-sim-failure ... Show error while allowing confirmation of tx where simulation fails	2018-08-08 22:13:41 -02:30
Dan Miller	973325a6c4	Show error while allowing confirmation of transaction where simulation fails	2018-08-08 21:26:25 -02:30
Whymarrh Whitby	51644962e9	Fix lint error in tx-list	2018-08-08 19:32:45 -02:30
Dan Miller	e98c3b4c01	Get nonce for showing retry button using ethQuery transaction count.	2018-08-08 17:04:42 -02:30
brunobar79	f269021dc3	add submit button type	2018-08-08 12:22:48 -04:00
brunobar79	cbbd0d3c75	lint	2018-08-08 03:21:37 -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
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
Alexander Tseung	f2194e8482	Merge pull request #4948 from MetaMask/i4638-update-font ... Update Font in Account Selector	2018-08-03 17:24:42 -07:00
brunobar79	b1ddaafba2	lint	2018-08-03 20:12:30 -04:00
brunobar79	e9a0feb9e9	fixed issue with input	2018-08-03 20:11:46 -04:00
Alexander Tseung	8e3f0b4202	Update Font in Account Selector	2018-08-03 16:47:50 -07:00
brunobar79	af97ba103c	clear qr code data before scanning	2018-08-03 19:36:01 -04:00
Esteban MIno	9ac9f53a73	eth_watchToken working	2018-08-03 19:24:12 -04:00
brunobar79	71ef4d85da	design complete	2018-08-03 18:57:23 -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
brunobar79	94a89790dc	fix	2018-07-31 18:58:54 -04:00
brunobar79	caa9e202cf	lint	2018-07-31 18:32:14 -04:00
brunobar79	710b4e294f	added crossbrowser support and error handling	2018-07-31 18:30:56 -04:00
Dan Miller	0ff0a9c197	Show the retry button on latest tx of earliest nonce.	2018-07-31 16:37:14 -02:30
brunobar79	edb154749d	send to fullscreen if no permission from popup	2018-07-30 22:57:05 -04:00