288 Commits

Author	SHA1	Message	Date
Alexander Tseung	58f52b2b8d	Fix merge conflicts. Refactor onboarding flow.	2018-03-28 13:23:50 -07:00
Alexander Tseung	6f367a5a6b	Fix merge conflicts	2018-03-27 00:20:35 -07:00
Dan	6393c38117	Pop uses new ui onboarding when in beta.	2018-03-22 14:29:18 -02:30
Dan Finlay	e504bc6215	Add connecting indication templates	2018-03-19 11:28:02 -07:00
Alexander Tseung	7fb27cf0c7	Update margins for consistency in first time flow (#3588)	2018-03-16 08:50:21 -07:00
Thomas Huang	1d2cb46eff	Merge branch 'master' into i18n	2018-03-13 11:00:52 -07:00
Dan	0dad6db973	Styling fixes to welcome; hide network component on create password; shown welcoem in popup.	2018-03-12 14:33:45 -02:30
Dan	91c890041c	Add welcome screen to new-ui browser first time flow.	2018-03-08 14:21:54 -03:30
Dan	9d215bab0f	Merge branch 'master' into i18n	2018-03-06 20:45:45 -03:30
Dan Finlay	f06bca1151	Implemented feedback to make i18n work on mac	2018-03-06 15:32:35 -08:00
Alexander Tseung	5f8a632fec	Fix seed phrase validation clearing form (#3417) ... * Fix seed phrase validation clearing form * Make new ui import seed error feedback live, and allow newlines with and without carriage returns.	2018-03-06 09:14:57 -08:00
Dan J Miller	1bd18cebd7	Fixes shapeshift coin selection dropdown. (#3416)	2018-03-05 13:33:46 -03:30
Dan J Miller	0d97ff2210	Fix NewUI reveal seed flow. (#3410)	2018-03-02 22:44:05 -03:30
Dan	0739d3507b	Adds beta label to Metamask name in full screen app bar.	2018-02-27 14:13:05 -03:30
Dan	def369ba07	Move beta warning to app header.	2018-02-27 14:13:05 -03:30
Dan	c26e0d555b	Fix Import Existing DEN in popup New UI first time flow.	2018-02-19 22:46:18 -03:30
Dan J Miller	81eb5c8796	Ensures that mascara initialize screen is not shown in popup. (#3279)	2018-02-16 19:21:16 -03:30
Dan J Miller	170c7602b7	[NewUI] Adds the mascara first time flow to betaUI extension (#3257) ... * Adds the mascara first time flow to the extension when opened in browser. * Fix tests after addition of mascara first time flow to new ui.	2018-02-16 06:15:09 -03:30
Dan J Miller	fe2ed68f11	Remove chrome focus outline for mouse users. (#3230)	2018-02-12 09:45:53 -08:00
Alexander Tseung	72ffa2c3f5	Fix react-router related exceptions	2018-02-09 12:05:27 -08:00
Alexander Tseung	eb919f4710	Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254	2018-02-08 16:43:31 -08:00
Dan J Miller	7f151b861c	[NewUI] Opens to full screen when restoring from seed. (#3201) ... * Opens to full screen when restoring from seed. * Remove redundant parameter in actions.markPasswordForgotten call.	2018-02-07 21:08:55 -03:30
Alexander Tseung	0c6fef3dec	Add create new account routes, fix conflicts from uat updates	2018-01-31 18:08:49 -08:00
Alexander Tseung	ecc39c5a7a	Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254	2018-01-29 18:22:52 -08:00
Alexander Tseung	81f86cfab6	Merge branch 'uat' into uat-master-011618	2018-01-16 18:17:28 -08:00
Dan Finlay	58be1742e1	Rename lock to log out ... Fixes #2475	2018-01-15 16:04:49 -08:00
Dan	980e1bfcf8	New add account page with create and import options.	2018-01-12 13:42:51 -08:00
Chi Kei Chan	71a308d98b	Merge branch 'uat' into cb-388	2018-01-12 13:41:03 -08:00
Alexander Tseung	bdcee058dc	Fix styling in initialization	2018-01-12 13:39:26 -08:00
Alexander Tseung	208e94d3bf	Update main view styling	2018-01-10 21:09:09 -08:00
Alexander Tseung	a6f062a686	Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c	2018-01-03 11:06:08 -08:00
oosthuizenr	1da385f78b	fix comment	2018-01-02 21:29:26 +02:00
Renier Oosthuizen	4a598fc7ac	Fixes #2834	2018-01-02 21:07:48 +02:00
Alexander Tseung	5d1187c37b	Add route for signature request	2017-12-14 14:11:23 -08:00
Alexander Tseung	706a6b0ad6	Add initialized checks for first time flow routes	2017-12-14 14:11:23 -08:00
Alexander Tseung	d9ea2df6c2	Add route for Mascara confirm seed	2017-12-14 14:11:23 -08:00
Alexander Tseung	ec5e0a711c	Fix lint errors	2017-12-14 14:11:23 -08:00
Alexander Tseung	dde39e82b5	Add routes for mascara	2017-12-14 14:11:23 -08:00
Alexander Tseung	e226b10a89	Add react-router to allow use of the browser back button	2017-12-14 12:50:20 -08:00
Dan	4e0485938a	Fix height of login screen	2017-12-12 12:31:52 -08:00
Dan	730d7f84ca	Update newUI UI for switching back to old UI.	2017-12-04 23:08:51 -03:30
Dan	84321b2d9b	Lint fix	2017-12-04 23:08:23 -03:30
Dan	7f79524070	Add UI selection	2017-12-04 23:08:23 -03:30
Dan	56e9f98bd0	More lint fixes	2017-11-02 09:45:59 -02:30
Dan	5a94775b3f	Lint fixes for NewUI-flat.	2017-11-02 00:00:33 -02:30
Alexander Tseung	3d8182f5d5	Add Info section	2017-10-25 12:16:47 -07:00
Chi Kei Chan	8d3a317b91	Show home page when metafox is clicked	2017-10-25 00:34:12 -07:00
Chi Kei Chan	7c20011023	Merge branch 'master' into NewUI-flat	2017-10-24 16:50:25 -07:00
Chi Kei Chan	6daa834323	Disable network dropdown on conf tx screen	2017-10-24 01:07:51 -07:00
Alexander Tseung	2c032e0df4	Update settings screen to new UI	2017-10-22 22:40:03 -07:00