1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 11:01:41 +01:00
Commit Graph

4565 Commits

Author SHA1 Message Date
Dan Finlay
37979fca68 Merge pull request #2241 from MetaMask/Version-3.10.8-FixCurrency
Version 3.10.8 - Fix Currency Conversion
2017-09-29 21:10:10 -07:00
Dan Finlay
d5b0d8af4f Version 3.10.8 - Fix Currency Conversion
In our conversion to the new Infura API, somehow we were sending upper-cased conversions to their lower-case sensitive API.

Fixes the first part of #2240
2017-09-29 20:57:15 -07:00
kumavis
7bdf73b1dd Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions
pending-tx - dont check the balance to rebrodcast
2017-09-29 17:36:49 -07:00
Frankie
8425fb04d3 Merge pull request #2239 from MetaMask/network-controller-contd
network - make network controller internal network switching explicit
2017-09-29 17:22:16 -07:00
kumavis
1ad8a9a0ff network - make network controller internal network switching explicit 2017-09-29 17:10:34 -07:00
Frankie
f57fd717fe Merge pull request #2237 from MetaMask/network-controller-contd
Networking refactor
2017-09-29 16:50:31 -07:00
kumavis
a2b6d3ffc5 network - remove long dead etherscan provider code 2017-09-29 16:37:01 -07:00
kumavis
d6ea2fa425 network - convert localhost from custom rpc to network type 2017-09-29 16:35:58 -07:00
kumavis
b88d11f86e network controller - small refactor 2017-09-29 16:09:38 -07:00
kumavis
b2796c168b Merge pull request #2234 from MetaMask/Version-3.10.7
Version 3.10.7
2017-09-29 13:23:12 -07:00
Dan Finlay
14d58e630d Version 3.10.7 2017-09-29 13:17:21 -07:00
frankiebee
ac80eaca1f pending-tx - dont check the balance to rebrodcast 2017-09-29 12:54:05 -07:00
Dan Finlay
77963e8417 Merge pull request #2230 from MetaMask/ui-dev-fix
development - fix ui dev
2017-09-29 12:11:48 -07:00
kumavis
19e7adad19 development - fix ui dev 2017-09-29 11:50:24 -07:00
Kevin Serrano
d61f36808a Merge pull request #2228 from MetaMask/i2218-SelectAccountBugFix
Ensure selected account is always set if possible
2017-09-29 11:31:18 -07:00
Dan Finlay
861bd877f3 Ensure selected account is always set if possible
Fixes #2218

Subscribes to keyringController, and if only one account exists, sets it as selected.
2017-09-29 11:19:54 -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
greenkeeper[bot]
f69cf1670f chore(package): update coveralls to version 3.0.0 2017-09-28 17:02:58 +00: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