4502 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
Dan Finlay	56dcf7c011	Version 3.11.1	2017-10-20 14:07:54 -07:00
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
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
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
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
Dan Finlay	a10a600cce	Linted	2017-10-19 12:33:43 -07:00
Dan Finlay	3b4c679ffc	Fix bug where new account was not immediately selected	2017-10-19 12:15:26 -07:00
Dan Finlay	0ae406e489	Allow computed balances to enumerate its own view	2017-10-19 09:59:57 -07:00
Dan Finlay	942de9ba02	Patch sandwich-expando for security update	2017-10-19 09:47:48 -07:00
kumavis	209db9ae5f	deps - bump eth-json-rpc-filters	2017-10-18 19:53:48 -07:00
Dan Finlay	4dc494fdd1	Fix bug that breaks ui dev mode	2017-10-18 17:14:42 -07:00
Dan Finlay	21bde66e16	Remove account-tracker from keyringController	2017-10-18 17:14:26 -07:00
Kevin Serrano	5bdee96e73	Merge pull request #2368 from MetaMask/greenkeeper/react-simple-file-input-2.0.0 ... Update react-simple-file-input to the latest version 🚀	2017-10-18 17:10:30 -07:00
Dan Finlay	bbe2c9f48d	Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault	2017-10-18 17:07:25 -07:00
Dan Finlay	d89394a7c9	Make account tracking much more reactive	2017-10-18 17:07:22 -07:00
Kevin Serrano	6eb2738957	Merge pull request #2396 from MetaMask/revert-2318-network-controller-client ... Revert "NetworkController refactor for new EthClient interface"	2017-10-18 15:53:43 -07:00
kumavis	8da0d0b28a	Revert "NetworkController refactor for new EthClient interface"	2017-10-18 15:09:32 -07:00
Dan Finlay	75177ce34c	Make account tracking more reactive ... We were doing a lot of conditional observation & updating. Pulled out a bunch of that for generic observer/syncers.	2017-10-18 15:08:34 -07:00