4497 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan	47ebcbb2ed	Token menu ui.	2017-10-01 19:02:21 -07:00
Dan	ff64fe98dd	Shapeshift deposit tx modal.	2017-10-01 18:58:57 -07:00
Dan	7c4d8c4562	Enables the old shapeshift UI within new ui.	2017-10-01 18:58:57 -07:00
Chi Kei Chan	67ee5b21e6	Query for gas estimates	2017-09-28 17:39:53 -07:00
Chi Kei Chan	4f106854ba	Hide ShapeShift and Fix Modal Stylings	2017-09-28 16:34:42 -07:00
Chi Kei Chan	06292107d7	Always set currency to USD on app mount	2017-09-28 16:13:53 -07:00
Dan	66ed4dfaa3	Ensure sent token value is recognized as hex.	2017-09-28 15:55:18 -07:00
Dan	a195427e72	Fix send of USD and backspacing amount to 0	2017-09-28 15:54:51 -07:00
Dan	b55a40c7f1	Close sidebar on token selection.	2017-09-28 15:54:04 -07:00
Dan	a4838b1c57	Close mobile sidebar when selecting 'Add token' from account options dropdown.	2017-09-28 15:54:04 -07:00
Chi Kei Chan	c74c1fe87f	Update yarn.lock	2017-09-28 15:07:31 -07:00
Chi Kei Chan	42ff763674	Merge pull request #2201 from chikeichan/merge ... Merge master into NewUI-flat	2017-09-27 22:55:44 -07:00
Chi Kei Chan	e711a4193f	Merge branch 'mmn' into merge	2017-09-27 22:54:21 -07:00
Chi Kei Chan	5a1d50cd43	Merge branch 'master' into mmn	2017-09-27 22:32:07 -07:00
Dan	deee689426	Use font-awesome icons for create and import account.	2017-09-27 18:08:49 -07:00
Dan	c2ccd6e90e	Makes styling fixes to account dropdown.	2017-09-27 18:08:49 -07:00
Dan	10345a12c2	Keep privateKey out of state and clear it after closing export private key modal.	2017-09-27 18:06:26 -07:00
Dan	01816e1b22	Adds a back button to export private key modal; connects account details to same modal.	2017-09-27 18:06:26 -07:00
kumavis	cdf41c2857	Merge pull request #2124 from MetaMask/breakout-mascara ... require metamascara	2017-09-27 16:27:01 -07:00
kumavis	e451655c10	Merge pull request #2177 from MetaMask/new-currency-test ... Switching To Infura's Currency API	2017-09-27 16:26:44 -07:00
frankiebee	b24e16d346	re-enabled x-metamask-origin for mascara	2017-09-27 16:14:58 -07:00
kumavis	15b2823e54	Merge branch 'master' into new-currency-test	2017-09-27 16:04:51 -07:00
kumavis	ecf909e140	Merge pull request #2194 from MetaMask/network-controller-refactor ... Network controller refactor	2017-09-27 15:56:23 -07:00
Thomas Huang	fc17d4511d	Merge pull request #2193 from MetaMask/FixAccountSelection ... Fix account selection	2017-09-27 15:40:45 -07:00
Dan Finlay	112c223930	Merge pull request #2196 from MetaMask/express-bump ... deps - bump express for security fix	2017-09-27 15:26:53 -07:00
Dan Finlay	b473d440a3	Version 3.10.6	2017-09-27 15:14:40 -07:00
Thomas Huang	504dcc3021	Merge pull request #2195 from MetaMask/greenkeeper/eth-keyring-controller-2.0.0 ... Update eth-keyring-controller to the latest version 🚀	2017-09-27 15:07:46 -07:00
kumavis	cd0f44e2d6	deps - bump express for security fix	2017-09-27 14:59:10 -07:00
Dan Finlay	a246770866	Commit to the eth-keyring-controller module	2017-09-27 14:55:34 -07:00
greenkeeper[bot]	c0d7d44764	fix(package): update eth-keyring-controller to version 2.0.0	2017-09-27 21:54:46 +00:00
Dan Finlay	aefd17ef94	Remove dead reference	2017-09-27 14:45:24 -07:00
kumavis	06b5dd2096	network controller - move _setProvider to bottom	2017-09-27 14:44:54 -07:00
Dan Finlay	ea12be2c1b	Bump changelog	2017-09-27 14:44:44 -07:00
kumavis	f2d9b75e94	network controller - refactor to use _setProvider	2017-09-27 14:44:13 -07:00
Dan Finlay	96ebbde634	Fix Account Selection ... Do not select accounts on restore, only on creation and deliberate selection. Fixes #2164	2017-09-27 14:43:34 -07:00
Dan Finlay	87458dae24	Merge pull request #2191 from MetaMask/direct-block-tracker ... Fix for direct use of eth-block-tracker	2017-09-27 14:22:41 -07:00
kumavis	7d499df8e3	account-tracker - remove unused import	2017-09-27 14:12:45 -07:00
kumavis	c781e11c7a	network - remove getter/setter	2017-09-27 14:10:58 -07:00
kumavis	7e9c6e96a1	metamask - improve comment	2017-09-27 14:10:17 -07:00
kumavis	4404dfc5d3	Merge branch 'master' into direct-block-tracker	2017-09-27 13:58:54 -07:00
kumavis	5bbea78306	Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3 ... Transaction controller refractor pt3	2017-09-27 13:57:04 -07:00
kumavis	496fd2a5ba	Merge pull request #2190 from MetaMask/Version-3.10.5 ... Version 3.10.5	2017-09-27 13:55:39 -07:00
kumavis	b41aad6d1a	style - small whitespace nitpick	2017-09-27 12:33:46 -07:00
kumavis	89e690fc79	account-tracker - use new block-tracker block format	2017-09-27 12:33:00 -07:00
Dan Finlay	1983e161c6	Fix accountTracker store references	2017-09-27 12:29:09 -07:00
Dan Finlay	a453eb132d	Version 3.10.5	2017-09-27 12:10:25 -07:00
Dan Finlay	8d3fec42d0	Fix bug where block gas limit was incorrectly parsed.	2017-09-27 12:09:32 -07:00
Dan Finlay	52976d6edc	Merge pull request #2189 from MetaMask/Version-3.10.4 ... Version 3.10.4	2017-09-27 11:54:14 -07:00
tmashuang	734490c58c	Add AUD, HKD, SGD, IDR, PHP to currency conversion list	2017-09-27 11:16:38 -07:00
Dan Finlay	d77e0aff4d	Version 3.10.4	2017-09-27 11:15:22 -07:00