Commit Graph

4489 Commits

Author SHA1 Message Date
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
Dan Finlay 828dbd7e3f Merge pull request #2155 from MetaMask/filter-fixes-moar
Various fixes you've been waiting for, how exciting!
2017-09-27 11:13:06 -07:00
Dan Finlay e72083f6e8 Merge branch 'master' into filter-fixes-moar 2017-09-27 10:57:02 -07:00
kumavis ca0dff06f5 Merge pull request #2153 from MetaMask/BreakOutKeyringController
Break out keyring controller into separate module
2017-09-27 10:44:52 -07:00
frankiebee 0a94ec41d3 pending-tx - move incrementing of the retryCount on the txMeta outside pending-tx-tracker 2017-09-26 22:42:59 -07:00
kumavis 1877c0766c Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController 2017-09-26 21:42:30 -07:00
Chi Kei Chan c77029ea90 Implement Confirm Deploy Contract screen 2017-09-26 19:21:04 -07:00
Dan 39365f2cc4 Update the correct values in state when estimates are received. 2017-09-26 18:43:26 -07:00
Dan 541b69dda9 Gets gas and price estimates when send components mount. 2017-09-26 18:43:26 -07:00