Commit Graph

2461 Commits

Author SHA1 Message Date
tmashuang dd18684a5d Remove unsued nonce tracker function 2018-06-25 15:01:14 -07:00
frankiebee 7d3da0ae96 migration 27 - remove rejected transactions from state 2018-06-25 11:45:00 -07:00
brunobar79 87dfca0767 fixes 2018-06-23 02:52:11 -04:00
Thomas Huang 46b2f1df11
Merge pull request #4592 from vittominacori/fix/close-popup-bug-#4553
set an id to the metamask notification popup
2018-06-20 15:50:07 -07:00
Dan 06307ef8ae Merge branch 'develop' into i4409-i4410-ens-input-enhancements 2018-06-19 21:39:52 -02:30
Thomas ea0dcdd312 Merge branch 'develop' into v4.8.0 2018-06-18 12:37:01 -07:00
kumavis 356cc50095 notice controller - properly show new notices for non-new users 2018-06-18 12:10:35 -07:00
kumavis 9a7f363c2a
Merge pull request #4586 from MetaMask/block-idex-phisher
Add apparent phishing address to block list
2018-06-18 11:26:19 -07:00
Csaba S 8aab4dd1fa View address of an added token (#4591)
* adding menu actions for tokens

* apply common style
2018-06-18 10:29:09 -07:00
vittominacori ff3c262621 set the popup id returned by create promise 2018-06-17 19:16:30 +02:00
vittominacori 4c1b526137 set an id to the metamask notification popup 2018-06-16 18:51:01 +02:00
kumavis 33cb0a8cb2 lint - fix recipient-blacklist.js 2018-06-15 11:07:56 -07:00
kumavis 83c02f90cf blacklist - recipient blacklist as js for inline comments 2018-06-15 10:47:42 -07:00
kumavis 753743e746
Update recipient-blacklist-config.json 2018-06-15 10:32:09 -07:00
Dan Finlay a42299aab7
Add apparent phishing address to block list
In [this reddit post](https://www.reddit.com/r/Metamask/comments/8r3nsu/help_me_please_somebody_stole_my_ethers/) a user suggests they got some ether stolen after visiting IDEX. Their ether was sent to [this address](https://etherscan.io/address/0x9bcb0a9d99d815bb87ee3191b1399b1bcc46dc77), which is full of comments of people telling similar stories of being phished on IDEX. I think we can safely block this, and probably safe some people some money.
2018-06-15 08:55:39 -07:00
Dan Finlay 3a6cc3c8fd Re-enable dapp reload on network change
We want to give devs some time to digest [this blog post](https://medium.com/metamask/breaking-change-no-longer-reloading-pages-on-network-change-4a3e1fd2f5e7) before we making a breaking change to our platform.

Makes it easy to re-implement the change.
2018-06-14 15:15:23 -07:00
Dan bb855707ef ENS input in send form shows distinct errors for invalid addresses and non-existent addresses. 2018-06-14 15:43:14 -02:30
Thomas ef31eeccb2 v4.8.0 2018-06-14 10:48:38 -07:00
kumavis d9ef72cb7e
Merge branch 'develop' into save-brave 2018-06-14 10:11:35 -07:00
Dan Finlay 11bfdf444d Handle brave throws 2018-06-14 10:09:45 -07:00
Dan Finlay d814bee578
Merge pull request #4571 from MetaMask/disable-diagnostics
diagnostics - temporarily disable
2018-06-14 10:03:53 -07:00
Dan Finlay 3a5089da6f
Merge pull request #4566 from MetaMask/notice-phishing
Push new notice on recent phishing incidents
2018-06-14 09:49:38 -07:00
kumavis 722c5ae821 notice-controller - update memStore on boot 2018-06-14 00:23:01 -07:00
kumavis 4b8a4fd5fe test - e2e - check for phishing warning 2018-06-13 23:52:51 -07:00
kumavis 44a8e48a04 notices - replace getLatestNotice with getNextNotice 2018-06-13 23:30:31 -07:00
kumavis ac8b56a00d notices - notices collection is now manually edited 2018-06-13 22:56:46 -07:00
kumavis e9cb650832 Merge branch 'develop' of github.com:MetaMask/metamask-extension into ValidateEmptyKey 2018-06-13 21:11:04 -07:00
kumavis 691ac5d288 account-import-strategies - ensure privateKey is prefixed before converting to buffer 2018-06-13 21:06:33 -07:00
kumavis 43e805805e diagnostics - temporarily disable 2018-06-13 17:40:28 -07:00
kumavis 7b414f3ed0 background - persistence pipeline - fix persistence bug 2018-06-13 16:45:18 -07:00
Bruno 704e2a21f8 clean up 2018-06-13 02:09:25 -04:00
Bruno bb4cc72646 fix merge conflicts 2018-06-13 02:01:47 -04:00
Bruno 8763ea898e move TrezorKeyring to its own package 2018-06-13 01:32:13 -04:00
Bruno d4201ae1cc added support for signPersonalMessage 2018-06-13 00:22:04 -04:00
Erik Marks bb201d7c4a
Merge branch 'develop' into stop-reload-on-network-change 2018-06-12 13:39:21 -07:00
kumavis 604289c96c controllers - transaction - prefer log over console 2018-06-12 12:08:06 -07:00
kumavis 177cc3f280 metamask - ensure all nonce locks are released 2018-06-12 11:51:35 -07:00
kumavis 8f93e34175 nonce-tracker - wrap nonce calculations in try-catch and release lock on error 2018-06-12 11:31:26 -07:00
Erik Marks b982961381 removed auto-reload.js, moved global web3 export to inpage.js 2018-06-12 11:04:37 -07:00
Erik Marks f461bd8812 wip 2018-06-12 09:28:50 -07:00
Dan Finlay b24efcb1cd Make account import tests much more specific
However, they no longer seem to work. I'm unclear why this test is
failing. The private key being provided should be valid.
2018-06-11 14:58:05 -07:00
Bruno 999b6bd24a clean up 2018-06-11 01:58:19 -04:00
Bruno 68d97211ff sign transactions is pretty close 2018-06-11 01:52:41 -04:00
Bruno d1880073f6 balances working 2018-06-10 21:10:22 -04:00
Bruno f6b27fa9eb add account working 2018-06-10 19:02:54 -04:00
Bruno f5f66f59d7 clean up 2018-06-10 18:48:42 -04:00
Bruno 8c4d58aa45 initial trezor support 2018-06-10 03:52:32 -04:00
Jenny Pollack e7c2710a55 Merge branch 'develop' into save-brave 2018-06-07 14:10:56 -07:00
Dan Finlay c0d2dab28b
Merge pull request #4523 from MetaMask/i4462-FixResetBug
Fix bug where reset account would not work.
2018-06-07 10:47:34 -07:00
Jenny Pollack fd8bcc9cb1 lint 2018-06-06 22:08:32 -07:00
Jenny Pollack 01a1eff8a8 remove loglevel 2018-06-06 18:35:41 -07:00
Jenny Pollack 7edde61c12 preferred first languauge - check for Brave 2018-06-06 18:24:45 -07:00
Jenny Pollack 275c31855d first language - add check for brave browser on getAcceptLanguages 2018-06-06 18:10:05 -07:00
Dan 11f5fdc927 Merge branch 'develop' into i3725-refactor-send-component- 2018-06-06 21:55:20 -02:30
Dan Finlay c53c5d5c9e Fix bug where reset account would not work.
Fixes #4462

Ensures that resetAccount() can work on non-stock providers.

I'm unclear how this was ever working, this code hasn't moved in months,
but users report it recently breaking. Maybe we only recently pushed it
to prod.
2018-06-06 16:46:39 -07:00
kumavis aea9491f6a
Merge pull request #4477 from MetaMask/i3073-block-gravityforms
Block gravityforms.com from web3 injection
2018-06-06 12:24:05 -07:00
Dan ae55e8a3c1 Merge branch 'develop' into i3725-refactor-send-component- 2018-06-06 16:40:43 -02:30
kumavis d30f03dcbf
Merge pull request #4414 from scsaba/recipient-blacklist
Disallow sending to ganache default accounts on main net
2018-06-06 11:54:01 -07:00
kumavis 546996c1f9
Merge pull request #4514 from whymarrh/account-label-type-check
Add account type assertion to PreferencesController#setAccountLabel
2018-06-06 11:42:52 -07:00
03-26 ccd4884db1 i18n - ja improvements 2018-06-06 11:38:57 -07:00
Whymarrh Whitby 3cc85c219e Add account type assertion to PreferencesController#setAccountLabel 2018-06-05 14:06:56 -07:00
Dan Finlay d61c979de6 Add validation for importing empty private key
Previously importing an empty string would result in a new empty Keyring
object to be constructed, with no notification to the user.

Now we render a clear error explaining the mistake.
2018-06-05 13:44:03 -07:00
kumavis f73feccf5a 4.7.4 2018-06-05 13:22:48 -07:00
kumavis cb7307b7ca Merge branch 'master' of github.com:MetaMask/metamask-extension into v4.7.4 2018-06-05 13:20:31 -07:00
kumavis 60e61e6834 diagnostics - fix reportMultipleKeyrings call 2018-06-05 12:36:15 -07:00
kumavis 36a0574f56 diagnostics - minor fixes 2018-06-05 12:20:24 -07:00
kumavis ece5cfc785 lint - fix diagnostics reporter 2018-06-05 11:53:21 -07:00
kumavis 20bdba3d17 diagnostics - rewrite bug-notifier as diagnostics-reporter 2018-06-05 11:51:27 -07:00
kumavis 6247e54fcc add multivault detection to diagnostics reporting 2018-06-05 11:15:58 -07:00
Dan aee9247faa Merge branch 'develop' into i3725-refactor-send-component- 2018-06-04 22:32:30 -02:30
kumavis 12a7fc4016 4.7.3 2018-06-04 16:11:19 -07:00
Dan Finlay 41f292437d Record identity before deleting it 2018-06-04 15:34:38 -07:00
Dan Finlay ae156e1087 Mock notifier in test 2018-06-04 15:26:01 -07:00
Dan Finlay f07ca73e07 Add comment 2018-06-04 15:18:12 -07:00
Dan Finlay 415ab2d534 Do not alert to user 2018-06-04 15:17:03 -07:00
Dan Finlay 22754e3e1f Linted 2018-06-04 15:10:51 -07:00
Dan Finlay 7b87afb4b7 Add bug info under metadata key 2018-06-04 15:06:21 -07:00
Dan Finlay 0eacee8e45 Add first time info to bug report 2018-06-04 15:03:31 -07:00
Dan Finlay 3bfc40c284 Add version to report 2018-06-04 14:59:46 -07:00
Dan Finlay d07c664b2c Fine tune error posting 2018-06-04 14:30:24 -07:00
Dan Finlay b858cc4b1b Only notify first time lost ids are detected 2018-06-04 14:24:45 -07:00
Dan Finlay f3b385cb09 Add reporting uri 2018-06-04 14:22:34 -07:00
Dan Finlay fd1ce4d741 Begin adding unconfigured notifier 2018-06-04 14:21:46 -07:00
Dan Finlay 8fcaa2cf56 Persist lost identities to storage for later analysis 2018-06-04 14:05:56 -07:00
Dan Finlay f5d4acf53b Add minimal user notification of issue. 2018-06-04 14:01:05 -07:00
Dan Finlay 7382bd0847 Add identity synchronizing code
Addresses #4475, where entries in the identities object do not
necessarily have corresponding accounts in the vault.

On password submission, this change passes known accounts to the
preferencesController (responsible for nickname management), and removes
unknown entries.

Includes "TODO" notes for where we could log the issue to sentry or
notify the user.
2018-06-04 13:43:26 -07:00
Dan Finlay 764643ed5f
Block gravityforms.com from web3 injection
Fixes #3073
2018-06-03 19:38:47 -07:00
kumavis a09b3737f2 4.7.2 2018-06-03 12:31:09 -07:00
kumavis eb3241ccba metamask-controller - clear account labels on restore from seed phrase 2018-06-03 12:02:35 -07:00
kumavis 54a9c62fd6 preferences controller - jsdoc fix 2018-06-03 11:30:11 -07:00
kumavis d4cdd1a0f3 metamask - update preferences controller identities on keyring controller update 2018-06-03 11:27:25 -07:00
kumavis a08e58f0fd
Merge pull request #4426 from MetaMask/sentry-url-rewrite-fix
sentry - message rewrite - guard against missing message
2018-06-03 10:50:05 -07:00
kumavis 72dde75e58
Merge pull request #4425 from MetaMask/master
Merge Master into Develop
2018-06-01 17:06:30 -07:00
Dan Finlay b1b90a6bb9 Version 4.7.1 2018-06-01 15:48:16 -07:00
Dan Finlay fbcea7043f Merge branch 'master' into develop 2018-06-01 15:47:28 -07:00
Whymarrh Whitby 1a18f03e2f
Fix return value of migration 26 when missing KC or PC 2018-06-01 15:46:31 -07:00
bitpshr ccae937f41 Properly end the middleware stack on RPC error 2018-06-01 12:57:57 -04:00
PhyrexTsai 8a571ece36
Update 404.html 2018-06-02 00:00:11 +08:00
PhyrexTsai f90d070190
Merge branch 'develop' into portal-metamask 2018-06-01 15:41:18 +08:00
Yung chieh Tsai cc5bdadbf1 Update 404 2018-06-01 15:30:57 +08:00
Yung chieh Tsai 77d17f2d55 Update ipfs to infura 2018-06-01 11:27:05 +08:00
Yung chieh Tsai 4e14313ba8 Update manifest.json 2018-06-01 11:26:44 +08:00
Dan 701611e317 Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-estimation 2018-05-31 15:39:24 -02:30
Dan 5091b03e4b Merge branch 'develop' into i3725-refactor-send-component- 2018-05-31 15:28:03 -02:30
Alexander Tseung cc73d869fe Add new alert modals 2018-05-31 10:37:52 -07:00
kumavis e2e4496c87 sentry - message rewrite - guard against missing message 2018-05-30 17:42:41 -07:00
Dan 0f20fce9b7 Auto update gas estimate when to changes. 2018-05-30 20:54:31 -02:30
kumavis e59f606adb 4.7.0 2018-05-30 15:08:44 -07:00
Csaba Solya 1dda0c6469 remove generating blocked accounts and use a config file instead 2018-05-30 21:15:59 +02:00
Csaba Solya 3e489ea165 fix documentation 2018-05-30 17:42:41 +02:00
Csaba Solya cf73581c0e adding tests for recipient blacklist checker 2018-05-30 17:38:27 +02:00
Csaba Solya 6affd8f949 adding transaction controller tests 2018-05-30 16:24:40 +02:00
Csaba Solya afb5788861 initial implementation 2018-05-30 15:53:18 +02:00
Yung chieh Tsai 181a11eae2 Update default provider 2018-05-30 09:57:31 +08:00
Alexander Tseung a19b911feb
Add rpc key to i18n messages (#4375) 2018-05-29 18:31:32 -07:00
kumavis 4205d92729 Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-master 2018-05-29 16:12:36 -07:00
kumavis 39069710d1
Merge pull request #4390 from MetaMask/i18n-brave-fix
i18n - getFirstPreferredLangCode - guard against missing i18n api
2018-05-29 11:05:12 -07:00
Alexander Tseung 41e38fe553
Add notification for dropped retry transactions (#4363) 2018-05-29 10:23:06 -07:00
Yung chieh Tsai 384cb126dd Update lib 2018-05-29 19:29:12 +08:00
kumavis 7e87600042
metamask-controller - lint fix 2018-05-28 23:14:38 -07:00
kumavis 09601439e3 metamask-controller - update preferences controller addresses after import account 2018-05-28 23:00:22 -07:00
kumavis e3ecc94a52
i18n - getFirstPreferredLangCode - guard against missing i18n api
fix for brave
2018-05-28 21:50:23 -07:00
Yung chieh Tsai 829deacb57 Rename files 2018-05-29 12:44:37 +08:00
Yung chieh Tsai 86ead431c3 Update manifest.json 2018-05-29 12:39:10 +08:00
MikeCheng1208 8b8cc94f6f Intergrate ENS with IPFS 2018-05-29 12:38:32 +08:00
MikeCheng1208 88a6b4edc7 setTimeout bug fix 2018-05-29 12:38:32 +08:00
MikeCheng1208 695b157e7b Intergrate ENS with IPFS 2018-05-29 12:38:25 +08:00
Anton 71a6e97327 cleanErrorStack moved to separate library module
more errors traces cleaned up
2018-05-28 22:57:08 +02:00
Anton 1d23a5c81b error message fix 2018-05-28 18:08:33 +02:00
Anton 62dc6e20eb Clean up user rejection error message 2018-05-28 17:57:45 +02:00
Dan 5bb399e55a Display correct titles and subtitles on send token and editing send transaction screens. 2018-05-24 17:27:33 -02:30
Frankie ed01c6c826
Merge pull request #4337 from MetaMask/recent-blocks-parallel
controllers - recent-blocks - pull first historical blocks in parallel
2018-05-22 16:08:33 -07:00
kumavis b5bbfd3264
Merge pull request #4308 from MetaMask/i4232-addtoken
Update designs for Add Token screen
2018-05-22 12:53:59 -07:00
kumavis fa37ba3992 controllers - recent-blocks - pull first historical blocks in parallel 2018-05-22 01:58:36 -07:00
Frankie e8b2e11c56 Reveal get filtered tx list (#4332)
* add getFilteredTxList from txController to getApi

* transactions - remove dead code (isNonceTaken)
2018-05-21 16:00:44 -07:00
kumavis 7a65c22a02
Merge branch 'develop' into ci-publish-release 2018-05-21 14:58:37 -07:00
kumavis f19d8a5905 Merge branch 'develop' of https://github.com/Trigalti/metamask-extension into Trigalti-develop 2018-05-21 14:14:03 -07:00
kumavis 08d95bbafa
Merge pull request #4034 from whymarrh/account-nicknames
Move account names out of KeyringController
2018-05-21 13:44:07 -07:00
kumavis e447438504
Merge pull request #3997 from jakubsta/master
Allow other extensions to connect
2018-05-21 13:41:09 -07:00
Alexander Tseung 4f6b53c1aa Update designs for Add Token screen 2018-05-19 23:04:19 -07:00
Dan Finlay 713c77db54
Merge pull request #4199 from MetaMask/i3487-provider-errors
RPC error middleware for json-rpc-engine
2018-05-18 11:57:29 -07:00
kumavis 2d4d77b17d docs - jsdoc - fix syntax 2018-05-18 11:52:28 -07:00
simon 22753d96fd Added trailing comma for eslint 2018-05-18 16:11:46 +02:00
simon 41502cb384 Added adyen.com to blacklisted domains because postMessages are blocking card encryption 2018-05-18 15:43:27 +02:00
Whymarrh Whitby 67310e151e Fix migration 026 to produce the correct shape for state.identities 2018-05-17 13:35:38 -02:30
Whymarrh Whitby 2d13fac476 Add migration to move identities from KeyringController 2018-05-17 12:57:39 -02:30
Whymarrh Whitby c54e4c7191 Add PreferencesController#setAddresses to update ids 2018-05-17 12:57:39 -02:30
Whymarrh Whitby cbe4d0d88c Update AddressBookController to read from preferences store 2018-05-17 12:57:39 -02:30
Whymarrh Whitby 924cc1fcf7 Move setAccountLabel into PreferencesController 2018-05-17 12:57:39 -02:30
kumavis 44f31f9a7e Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-transaction-history-timestamps 2018-05-16 13:56:32 -07:00
kumavis 76c8cb3d7b
Merge pull request #4146 from MetaMask/sentry-error-like2
sentry - add helper to fully rewrite all error messages
2018-05-16 13:54:15 -07:00
kumavis 8e1cad5ff6
tx-state-history-helper - use more readable Date.now method 2018-05-16 13:05:07 -07:00
kumavis d62fc22611 network - remove debugging console.log 2018-05-16 11:59:50 -07:00
kumavis c27d9162d7 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints 2018-05-16 11:57:07 -07:00
bitpshr ce2834400c Add new json-rpc-engine middleware for improved error handling 2018-05-14 08:33:47 -04:00
Alexander Tseung 0bcfbc1544 Add error message when passwords don't match in first time flow. Change input field styling in first time flow 2018-05-13 21:46:12 -07:00
Alexander Tseung 2381c0e0f4 Add new unlock screen design 2018-05-11 12:49:17 -07:00
Orange bfc19e403b Chinese translation Enhancements (#4218) 2018-05-11 10:09:14 -07:00
Csaba Solya 2081768fc5 fix lint issues 2018-05-10 13:43:31 +02:00
Csaba Solya 3642810584 remove unnecessary lib 2018-05-10 13:34:56 +02:00
Csaba Solya 349fb9e0bc revert unnecessary change in state manager 2018-05-10 13:33:40 +02:00
Csaba Solya 9026651224 add time stamps to transaction history log entries 2018-05-10 13:26:02 +02:00
bitpshr 6351b7bb88 Fix documentation typo 2018-05-07 15:08:43 -04:00
Filip Š caf5a6c15c Fix Slovenian translation (#4189) 2018-05-07 15:05:34 -04:00
kumavis a1d13d45cf lint - cleanup some unused variables 2018-05-02 18:23:55 -07:00
kumavis fec4c50657 controllers - network - move default config out of first-time-state 2018-05-02 18:03:59 -07:00
frankiebee a45cb75435 transactions - add a nonce check utility for ui use 2018-05-01 13:57:43 -07:00
frankiebee 62bf76db53 fix - getTxsByMetaData check if the key is in the object not if the value is truthy 2018-05-01 13:57:14 -07:00
kumavis 53caa49666 network - refactor to remove unnecesary code 2018-04-30 17:59:53 -07:00
kumavis 6f316ca450 network - remove setNetworkEndpoints 2018-04-30 16:36:17 -07:00
kumavis bfedd2776d controllers - network - more semantic assert 2018-04-30 16:23:16 -07:00
kumavis 84275456e4
Merge pull request #4143 from prettymuchbryce/blacklist-shopify-iframe
Blacklist problematic shopify iFrame
2018-04-30 17:06:19 -06:00
kumavis 93a9ef284e sentry - add helper to fully rewrite all error messages 2018-04-30 16:05:01 -07:00
Thomas Huang 3180b69b97
Merge pull request #4140 from MetaMask/v4.6.1
Version 4.6.1
2018-04-30 14:37:22 -07:00
Bryce Neal 18a8a21179 Blacklist problematic shopify iFrame 2018-04-30 14:35:47 -07:00
kumavis 477063a5a0 Version 4.6.1 2018-04-30 13:29:22 -07:00
kumavis e881ea7aaf sentry - report error-like messages using the obj message 2018-04-30 12:10:15 -07:00
kumavis 2a8d3ea450 sentry - wrap report modifiers in a try-catch 2018-04-30 12:07:48 -07:00
kumavis 5f3f8c85fc
Merge pull request #4059 from MetaMask/i-4033-seed-words
Use new design for Reveal Seed screen. Persist seed words only in the first time flow.
2018-04-30 12:04:53 -06:00
frankiebee 98ae853b6c require log 2018-04-30 09:57:36 -07:00
kumavis 755d4945f7
Merge pull request #4132 from MetaMask/master
Master
2018-04-30 09:38:12 -06:00
frankiebee 706647785c log emitter errors 2018-04-29 16:35:08 -07:00
frankiebee 7eb735651b transactions - run event emitters outside context of _setTxStatus 2018-04-29 16:32:16 -07:00
frankiebee 873f85d996 guard adainst raven erroring 2018-04-29 13:46:07 -07:00
kumavis 2b9925a9e4
Merge pull request #4110 from MetaMask/master
Develop - Add commits to develop that are already in Master
2018-04-27 16:17:46 -06:00
bitpshr 8c5994abc9 Return 0 for token rate fetch failures 2018-04-26 18:31:54 -04:00
Thomas Huang 4e7b0ff15c
Merge pull request #4095 from MetaMask/v4.6.0
Version 4.6.0
2018-04-26 14:16:35 -07:00
kumavis b97457e9e2 v4.6.0 2018-04-26 13:43:44 -07:00
kumavis dcd04091cc
Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3
docs and file organization for txController
2018-04-25 16:52:46 -06:00
kumavis 1c63b11e3f rpc - bump provider-engine + eth-json-rpc-filters 2018-04-25 14:02:41 -07:00
frankiebee 8ffce8b59d transactions - more docs and clean ups 2018-04-25 11:13:51 -07:00
Dan Finlay f6653b9f94
Merge pull request #4069 from MetaMask/i4056-LatestPriceApi
Use latest balanc3 api for prices
2018-04-25 10:42:03 -07:00
Dan Finlay 7ec775d614 Use latest balanc3 api for prices 2018-04-24 14:12:57 -07:00
Dan 0fbd389a50 lint fix 2018-04-24 13:18:34 -02:30
Dan ed264d3479 Merge branch 'master' into dm-docs-2 2018-04-24 12:36:30 -02:30
Dan 020824f3c7 Remove accidentally added code in message-manager. 2018-04-24 12:36:26 -02:30
Dan 016d492414 Remove unnecessary doc comment. 2018-04-24 12:20:38 -02:30
Dan Finlay a833f02f33 Use the metamask balanc3 dev price api
Fixes #4056
2018-04-23 16:39:33 -07:00
Dan Finlay 9dd8158b1d
Merge pull request #4029 from MetaMask/DocumentMetaMaskController
Added docs to MM-controller
2018-04-23 15:49:47 -07:00
Dan Finlay 4289f813e9
Merge pull request #3968 from MetaMask/gh-3653
Clean up network config
2018-04-23 15:49:17 -07:00