4855 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chi Kei Chan	5484e68896	Add Integration Tests	2017-10-20 21:51:37 -07:00
Chi Kei Chan	d9735ed5b3	Fixing integraiton test	2017-10-20 21:51:37 -07:00
Chi Kei Chan	996523c790	Fix unit test	2017-10-20 21:51:37 -07:00
Chi Kei Chan	ac50db52a9	Fix linter	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
Chi Kei Chan	e88baff2ee	Add missing presets	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
Thomas Huang	20cb6a76dd	Merge pull request #2419 from MetaMask/Version-3.11.1 ... Version 3.11.1	2017-10-20 21:58:18 -04:00
Chi Kei Chan	8f3b762461	Fix Conversions bugs; Fiat value bugs	2017-10-20 18:26:18 -07:00
Chi Kei Chan	5eb3cf43bf	Add resiliency to confirm-send-token	2017-10-20 16:18:25 -07:00
Chi Kei Chan	d6f1f2bcca	Merge pull request #2410 from alextsg/nu-2280 ... [NewUI] Fix loading animation not showing on network change	2017-10-20 15:35:26 -07:00
Chi Kei Chan	511339a969	Merge pull request #2413 from danjm/NewUI-flat-fix-addtoken-search ... [NewUI-flat] Fixes add token search.	2017-10-20 15:35:04 -07:00
Chi Kei Chan	92d922c937	Merge pull request #2418 from danjm/NewUI-flat-fix-confirm-token ... [NewUI] Fixes regression in confirm-send-token	2017-10-20 15:31:09 -07:00
Dan Finlay	56dcf7c011	Version 3.11.1	2017-10-20 14:07:54 -07:00
Dan	80025e278b	Fixes regression in confirm-send-token	2017-10-20 18:17:13 -02:30
Frankie	09e04606cd	Merge pull request #2401 from MetaMask/filter-fix-maybe ... filters bug fix	2017-10-20 13:13:18 -07:00
kumavis	a71c95b987	changelog entry for filter fix	2017-10-20 12:32:15 -07:00
kumavis	61e1b821d4	Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-fix-maybe	2017-10-20 12:31:40 -07:00
kumavis	8472ca406a	deps - bump eth-json-rpc-filters for log filter fix	2017-10-20 12:29:12 -07:00
Chi Kei Chan	344b467d03	Merge branch 'master' into NewUI-flat	2017-10-20 11:05:10 -07:00
kumavis	2a18f732c7	Merge pull request #2412 from MetaMask/x-frame-options ... mascara - set x-frame-options header to DENY	2017-10-20 11:04:11 -07:00
Thomas Huang	e3a7da961d	Merge pull request #2389 from MetaMask/i2348-SelectAccountOnNewVault ... Select first account on create or restore vault	2017-10-20 12:09:44 -04:00
Dan	b25c73a866	Only show erc20 tokens in add token search.	2017-10-20 12:01:34 -02:30
Dan	89573533b8	Fixes add token search.	2017-10-20 11:48:01 -02:30
Thomas Huang	c24e266118	Merge branch 'master' into i2348-SelectAccountOnNewVault	2017-10-20 09:04:57 -04:00
frankiebee	5c902423d9	mascara - set x-frame-options header to DENY	2017-10-20 02:30:46 -07:00
Alexander Tseung	5a93ec0252	Fix loading animation not showing on network change	2017-10-19 21:06:14 -07:00
kumavis	87ad6a29f0	Merge pull request #2409 from chikeichan/fix-account-creation ... Update eth-keyring-controller dependency	2017-10-19 17:59:41 -07:00
Chi Kei Chan	69d8359639	Update eth-keyring-controller dependency	2017-10-19 17:48:45 -07:00
Chi Kei Chan	79be956be9	Fix network dropdown styles	2017-10-19 14:10:29 -07:00
Chi Kei Chan	0458643f10	various styling fix on mobile	2017-10-19 14:08:58 -07:00
Chi Kei Chan	376ae032fe	Fix selectors	2017-10-19 12:47:44 -07:00
Chi Kei Chan	d3f923efef	Merge pull request #2399 from danjm/MM-128-get-currentCurrency-from-state ... [NewUI] Get currentCurrency from state, allows other fiats	2017-10-19 12:35:49 -07:00
Chi Kei Chan	f1c097ab5c	Merge branch 'NewUI-flat' into MM-128-get-currentCurrency-from-state	2017-10-19 12:35:39 -07:00
Dan	c2880c4b8f	Min and default gas price, limit, total; comments out code for gas slider.	2017-10-19 12:34:34 -07:00