131 Commits

Author	SHA1	Message	Date
Esteban MIno	e743f44150	fix conflicts	2018-08-28 15:20:30 -03:00
Esteban MIno	b59a1e91b8	typo watchAsset imageUrl to image	2018-08-23 15:54:40 -03:00
Whymarrh Whitby	f495c0e9e0	Merge pull request #5102 from whymarrh/fix-account-export-pw-bug ... Fix export privkey modal password bugs	2018-08-22 16:28:33 -02:30
Whymarrh Whitby	1e8e8bdfc8	Don't re-render the export modal when the selected identity changes	2018-08-22 15:38:34 -02:30
Whymarrh Whitby	a90c152485	Update AccountModalContainer to accept a selectedIdentity prop	2018-08-22 15:38:34 -02:30
Whymarrh Whitby	743c6e7ca4	Clear warnings when exportAccount succeeds	2018-08-22 15:38:09 -02:30
Whymarrh Whitby	456f2faf4f	Handle case where keyring is missing in AccountDetailsModal	2018-08-22 15:38:09 -02:30
Esteban MIno	6fa889abcb	refactor watchToken related functions	2018-08-21 12:59:42 -03:00
Esteban MIno	81cd29df43	Merge branch 'develop' into WatchTokenFeature	2018-08-20 19:35:38 -03:00
Esteban MIno	dbab9a007f	delete according image when token added with watchToken deleted	2018-08-16 21:17:02 -03:00
Esteban MIno	a36ea0e232	show watch asset image from hide token modal	2018-08-16 12:04:43 -03:00
brunobar79	c72ced79ae	ui fixes	2018-08-14 19:22:00 -04:00
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	af97ba103c	clear qr code data before scanning	2018-08-03 19:36:01 -04:00
brunobar79	71ef4d85da	design complete	2018-08-03 18:57:23 -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
brunobar79	edb154749d	send to fullscreen if no permission from popup	2018-07-30 22:57:05 -04:00
brunobar79	b673a7a7fc	kill camera stream when unmouting	2018-07-30 18:40:00 -04:00
brunobar79	34617a21c3	copy	2018-07-30 18:36:37 -04:00
brunobar79	d2368d6fe0	clean up css	2018-07-30 18:34:00 -04:00
brunobar79	4339f04e80	use existing modals	2018-07-30 17:50:05 -04:00
brunobar79	d05814a5ad	Merge branch 'develop' into initial-trezor-support	2018-07-16 12:55:13 -04:00
Whymarrh Whitby	d38405fb0e	Fix send import path in customize gas modal	2018-07-16 13:07:42 -02:30
brunobar79	289795fb12	fix account balance bug	2018-07-13 00:09:42 -04:00
brunobar79	5710e648bd	remove account modal updated	2018-07-12 18:19:33 -04:00
brunobar79	4b528405ea	catching up with develop	2018-07-12 13:19:51 -04:00
brunobar79	07d8bfaec5	Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support	2018-07-12 12:54:08 -04:00
brunobar79	2a0a785324	added tooltip	2018-07-12 00:23:08 -04:00
brunobar79	5a2a34591f	clean up	2018-07-11 01:35:37 -04:00
brunobar79	523cf9ad33	account removal is working	2018-07-11 00:20:40 -04:00
brunobar79	b9c2994d24	finish warning modal UI	2018-07-10 19:19:29 -04:00
Alexander Tseung	a2d9c43fba	Various fixes from PR comments	2018-07-06 16:27:08 -07:00
Alexander Tseung	ea9d51e427	Refactor and redesign confirm transaction views	2018-07-06 16:27:08 -07:00
Dan J Miller	3b6e96bac9	Update hide-token-confirmation-modal.js to use new modalState schema (#4482) ... * Update hide-token-confirmation-modal.js to use new modalState schema (added in 41e38fe55). * Fix modalState props	2018-06-04 16:13:32 -07:00
Alexander Tseung	cc73d869fe	Add new alert modals	2018-05-31 10:37:52 -07:00
Alexander Tseung	f4d833cb09	Change btn-secondary styles to btn-default. Make btn-secondary red warning style buttons	2018-05-31 10:37:52 -07:00
Alexander Tseung	41e38fe553	Add notification for dropped retry transactions (#4363)	2018-05-29 10:23:06 -07:00
Whymarrh Whitby	924cc1fcf7	Move setAccountLabel into PreferencesController	2018-05-17 12:57:39 -02:30
Alexander Tseung	9e41f58af2	Clean up network config	2018-04-23 10:18:05 -07:00
bitpshr	cce123c30e	Show checksummed addresses throughout the UI	2018-04-18 09:47:05 -04:00
Alexander Tseung	b0a105ce80	Fix confirmation popup not always opening	2018-04-17 08:58:37 -07:00
kumavis	b49ad750dd	Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts	2018-03-29 16:54:00 -07:00
Dan	0a711f0de0	Removes t from props via metamask-connect and instead places it on context via a provider.	2018-03-29 12:42:38 -02:30
kumavis	10609493c5	ui - use relative location for images	2018-03-28 22:30:35 -07:00
kumavis	cf82e766d4	ui - fix relative url for deposit-ether-modal	2018-03-28 22:21:49 -07:00
Dan	4f0881e41b	Merge branch 'master' into i18n-translator-redux	2018-03-26 16:13:49 -02:30