69 Commits

Author	SHA1	Message	Date
Alexander Tseung	e4895df953	Change styling of Import Account with Seed Phrease (#3182)	2018-02-05 12:39:33 -08:00
Alexander Tseung	be398500de	Merge pull request #2848 from MetaMask/NewUI-flat ... [NewUI] Merge NewUI-flat into uat	2018-01-03 13:24:17 -08:00
Alexander Tseung	3f17abd43b	Fix mascara first time flow button colors	2017-12-29 13:17:01 -08:00
Alexander Tseung	409d1d30e9	Merge pull request #2799 from MetaMask/NewUI-flat ... Update UAT to version 4.0.5	2017-12-22 11:40:20 -08:00
Dan	ec6c3c33bd	Merge branch 'master' into NewUI-flat-merge-with-master	2017-12-06 21:11:52 -08:00
frankiebee	a89b682dec	mascara:create-password - use less words in metamask explanation	2017-11-06 12:48:58 -05:00
frankiebee	910c69f655	mascara - fix words and enviroment vars	2017-11-02 12:24:50 -05:00
frankiebee	81af91371d	mascara:first-time - fix wording	2017-10-31 14:26:17 -05:00
frankiebee	032582afda	mascara:first-time - add alpha warning and a about metamask and mascot	2017-10-31 14:02:02 -05:00
Chi Kei Chan	e89ae877aa	Add BuyEtherWidget for future use in buy ether modal	2017-10-24 22:21:30 -07:00
tmashuang	099078d13b	Add error messages when importing an account	2017-10-24 08:40:07 -07:00
Chi Kei Chan	f503120b82	Add Import With Seed Phrase	2017-10-20 22:31:59 -07:00
Chi Kei Chan	2b26496826	Add mobile responsiveness	2017-10-20 21:51:37 -07:00
Chi Kei Chan	213cf6aa09	Remove import option	2017-10-20 21:51:37 -07:00
Chi Kei Chan	63a5eca967	Fix import	2017-10-20 21:51:37 -07:00
Chi Kei Chan	25f4f69706	Fix capitialization	2017-10-20 21:51:37 -07:00
Chi Kei Chan	5484e68896	Add Integration Tests	2017-10-20 21:51:37 -07:00
Chi Kei Chan	5cbbb476b3	ShapeShift Integration	2017-10-20 21:51:37 -07:00
Chi Kei Chan	5aaa2d679b	Add ShapeShift UI	2017-10-20 21:51:37 -07:00
Chi Kei Chan	c6a3d00d80	Fix merge conflict; separate onboarding buy screen	2017-10-20 21:51:37 -07:00
Jacky Chan	ad647050d6	Move "Skip this step" to side panel	2017-10-20 21:51:37 -07:00
Jacky Chan	a4ad88c331	Disable CTA unless notice is scrolled to bottom	2017-10-20 21:51:37 -07:00
Jacky Chan	945cc5d18d	Fix Buy Ether flow	2017-10-20 21:51:37 -07:00
Jacky Chan	638bbe0428	Shuffle tokens	2017-10-20 21:51:37 -07:00
Jacky Chan	85e485128f	Add Go to Coinbase; Show Buy Ether after signup	2017-10-20 21:51:37 -07:00
Jacky Chan	4ecd28ca9b	Hide Warning after changing import options	2017-10-20 21:51:37 -07:00
Jacky Chan	0cc521e130	Implement Buy Ether Screen UI	2017-10-20 21:51:37 -07:00
Jacky Chan	449bce5eea	Implement Import Account Screen	2017-10-20 21:51:37 -07:00
Jacky Chan	1a9b217558	Add BackupPhraseScreen	2017-10-20 21:51:37 -07:00
Jacky Chan	fd4fbdc0cd	Add NoticeScreen	2017-10-20 21:51:37 -07:00
Jacky Chan	e1497fafa6	Add UniqueImageScreen	2017-10-20 21:51:37 -07:00
Jacky Chan	4e446410eb	Add Breadcrumbs	2017-10-20 21:51:37 -07:00
Jacky Chan	537f8a6ce1	CreatePasswordScreen	2017-10-20 21:51:37 -07:00
Jacky Chan	0264ecaad7	Adding CreatePasswordScreen	2017-10-20 21:51:37 -07:00
frankiebee	7ec068d279	mascara/background: use async await	2017-10-04 23:26:56 -07:00
frankiebee	5eca4223b2	use log.debug	2017-10-04 23:07:40 -07:00
frankiebee	7a9e2aa4f0	mascara: linting and code clean up	2017-10-04 23:03:47 -07:00
frankiebee	418f01411e	mascara: turn off background	2017-09-19 16:48:42 -07:00
frankiebee	29dd81d029	require metamascara	2017-09-18 19:08:02 -07:00
kumavis	0ab37b52c0	mascara - proxy - small cleanup	2017-09-15 13:13:13 -07:00
kumavis	779e973b45	tests - integration - mascara - small cleanup and timeout adjustments	2017-09-15 12:19:52 -07:00
frankiebee	c5a2527c17	set time if platform is mascara	2017-09-15 11:57:25 -07:00
frankiebee	7fb8623568	dont reload on initial download and wait before passing sw to ui	2017-09-15 11:09:19 -07:00
kumavis	b53d04c409	tests - integration - get flat and mascara tests closer to compatible	2017-09-13 20:25:27 -07:00
kumavis	56db3999ad	tests - start migrating mascara tests to karma	2017-09-13 16:45:31 -07:00
kumavis	dbcc82f5c4	mascara - fix iframe stream constructor	2017-09-01 12:03:28 -07:00
frankiebee	3d1d38a2c0	reload page if ui is not present	2017-06-08 17:36:21 -07:00
frankiebee	a0a19468a8	reload the page when switching networks	2017-06-08 17:34:51 -07:00
frankiebee	1a70141e8b	clean up code	2017-06-08 17:32:50 -07:00
frankiebee	d4cad22fa7	clean up code	2017-04-28 21:19:14 +02:00