326 Commits

Author	SHA1	Message	Date
kumavis	44a8e48a04	notices - replace getLatestNotice with getNextNotice	2018-06-13 23:30:31 -07:00
Dan	ae55e8a3c1	Merge branch 'develop' into i3725-refactor-send-component-	2018-06-06 16:40:43 -02:30
Dan	5091b03e4b	Merge branch 'develop' into i3725-refactor-send-component-	2018-05-31 15:28:03 -02:30
Dan	1c3d2aa18b	Importing account by json and private key shows error and does not change account if no selectedAddress comes after import.	2018-05-30 17:00:50 -02:30
Alexander Tseung	389346913b	Prevent loading screen from overlaying the app bar (#4417)	2018-05-30 10:38:53 -07:00
Alexander Tseung	41e38fe553	Add notification for dropped retry transactions (#4363)	2018-05-29 10:23:06 -07:00
Dan	440905125d	Merge branch 'develop' into i3725-refactor-send-component-	2018-05-23 16:03:15 -02:30
Alexander Tseung	4f6b53c1aa	Update designs for Add Token screen	2018-05-19 23:04:19 -07:00
Alexander Tseung	5561937773	Fix account and network dropdowns in confirm screen	2018-05-14 15:03:04 -07:00
Dan	6bc8cc819a	Merge branch 'develop' into i3725-refactor-send-component-	2018-05-14 11:44:50 -02:30
Alexander Tseung	2381c0e0f4	Add new unlock screen design	2018-05-11 12:49:17 -07:00
kumavis	096851d091	Merge pull request #4156 from MetaMask/i4010-spinner ... Fix styling of the app spinner	2018-05-02 17:00:57 -07:00
Alexander Tseung	ffda954add	Fix styling of the app spinner	2018-04-30 18:58:37 -07:00
Dan	26f965bcce	Further refactors; includes refactor of send-v2.js and associated container	2018-04-30 13:05:48 -02:30
Alexander Tseung	3082d2e4ef	Use new design for reveal seed screen. Persist seed words only in first time flow	2018-04-22 09:24:21 -07:00
Alexander Tseung	477b74124d	Revert "Fix UI getting stuck in Reveal Seed screen" ... This reverts commit 2c8156ebe9.	2018-04-21 22:23:45 -07:00
Dan Finlay	061975cd4a	Merge pull request #3977 from MetaMask/i-3913-big-number ... Fix BigNumber exception in confirm-send-ether	2018-04-18 11:45:20 -07:00
Alexander Tseung	2c8156ebe9	Fix UI getting stuck in Reveal Seed screen	2018-04-18 10:18:24 -07:00
Alexander Tseung	053044fb65	Fix spinner layout	2018-04-18 01:03:07 -07:00
bitpshr	7129d7c0f3	Require loglevel singleton in each module that uses it	2018-04-13 17:56:28 -04:00
Alexander Tseung	1e6f062bb6	Fix integration tests	2018-04-06 11:25:05 -07:00
Alexander Tseung	007f91cc50	commit	2018-04-03 17:43:42 -07:00
Alexander Tseung	35875863d2	Fix merge conflicts. Modify send workflow	2018-04-03 01:03:31 -07:00
Alexander Tseung	516c1869b0	Fix lint errors	2018-04-02 16:24:37 -07:00
Alexander Tseung	6277a4c46a	Refactor onboarding flow	2018-04-02 02:59:49 -07:00
Alexander Tseung	2fa554a641	Fix conf-tx render	2018-03-30 17:37:24 -07:00
Alexander Tseung	ba23843f91	Fix merge conflicts	2018-03-30 16:18:48 -07:00
Alexander Tseung	bdc4a6964a	Fix merge conflicts. Refactor renderPrimary into Home component	2018-03-30 15:07:00 -07:00
kumavis	b49ad750dd	Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts	2018-03-29 16:54:00 -07:00
Alexander Tseung	ef61ef2ce8	Fix i18n merge conflicts	2018-03-29 09:37:29 -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
Alexander Tseung	58f52b2b8d	Fix merge conflicts. Refactor onboarding flow.	2018-03-28 13:23:50 -07:00
Dan	d2bd5687e8	Merge branch 'master' into i18n-translator-redux	2018-03-27 10:17:48 -02:30
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	d24a0590d3	i18n redux solution doesn't require importing t() and passing state to each t() call; t is just available on props.	2018-03-21 22:11:47 -02:30
kumavis	29cc2f8ab9	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-20 13:01:08 -07:00
Dan Finlay	e504bc6215	Add connecting indication templates	2018-03-19 11:28:02 -07:00
Dan	5733820024	Merge branch 'master' into i18n-translator-redux	2018-03-19 14:39:04 -02:30
Alexander Tseung	7fb27cf0c7	Update margins for consistency in first time flow (#3588)	2018-03-16 08:50:21 -07:00
Dan	5fe0be722b	Handle i18n with redux.	2018-03-15 21:59:45 -02:30
kumavis	34aeef50a0	i18n - load locales manually	2018-03-14 16:32:35 -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