Commit Graph

4878 Commits

Author SHA1 Message Date
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
kumavis 48f348e729 4.0.1 2017-10-20 11:30:56 -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
Dan 7362fb8dfc Identicon in send token show who you are sending to, not the token's identicon. 2017-10-19 12:34:14 -07:00
Dan 89af385a35 Fix handling of arithmetic on token gas in confirm-send-token. 2017-10-19 12:34:14 -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 332c7441b6 Get currency from state in account details, send and confirm screens. 2017-10-19 16:30:54 -02:30
Dan 59015cccef Min and default gas price, limit, total; comments out code for gas slider. 2017-10-19 16:26:46 -02:30
Dan bd11e60b8c Amount field shows insufficient funds error based on amoutn + gas total. 2017-10-19 11:38:14 -07:00
Dan f01d119cc1 Fixes mobile styling. 2017-10-19 11:38:14 -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
Chi Kei Chan 776e8241f0 Merge pull request #2402 from chikeichan/merge
[NewUI] Merge master into NewUI-flat
2017-10-18 23:04:54 -07:00
Chi Kei Chan a8bba2f4b7 Merge master to NewUI-flat 2017-10-18 23:01:40 -07:00
Chi Kei Chan c8c773d641 Merge branch 'NewUI-flat' into merge 2017-10-18 22:58:46 -07:00
Dan de1da7d1b2 Fix cancel button on send screen. 2017-10-18 20:21:46 -07:00
Dan 6e73eacd5f Turn off feature toggle. 2017-10-18 20:21:46 -07:00
Dan 60eda592b5 Handling to and amount errors. 2017-10-18 20:21:46 -07:00
Dan f81226fbe9 Move all of send state to metamask state. 2017-10-18 20:21:46 -07:00
Dan 4f9ac1c4fe Get from and update addressBook in send-v2 2017-10-18 20:21:46 -07:00
Dan 4915aff750 Breaks send-v2 down into renderable functions. 2017-10-18 20:21:46 -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