Merge pull request #4095 from MetaMask/v4.6.0

Version 4.6.0

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Current Master
 
+## 4.6.0 Thu Apr 26 2018
+
 - Correctly format currency conversion for locally selected preferred currency.
 - Improved performance of 3D fox logo.
 - Fetch token prices based on contract address, not symbol

CONTRIBUTING.md

@@ -12,12 +12,14 @@ For any new programmatic functionality, we like unit tests when possible, so if
 
 ### PR Format
 
-We use [waffle](https://waffle.io/) for project management, and it will automatically keep us organized if you do one simple thing:
-
 If this PR closes the issue, add the line `Fixes #$ISSUE_NUMBER`. Ex. For closing issue 418, include the line `Fixes #418`.
 
 If it doesn't close the issue but addresses it partially, just include a reference to the issue number, like `#418`.
 
+Submit your PR against the `develop` branch. This is where we merge new features so they get some time to receive extra testing before being pushed to `master` for production.
+
+If your PR is a hot-fix that needs to be published urgently, you may submit a PR against the `master` branch, but this PR will receive tighter scrutiny before merging.
+
 ## Before Merging
 
 Make sure you get a `:thumbsup`, `:+1`, or `LGTM` from another collaborator before merging.

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "4.5.5",
+  "version": "4.6.0",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "__MSG_appDescription__",

app/scripts/controllers/network/network.js

@@ -1,7 +1,7 @@
 const assert = require('assert')
 const EventEmitter = require('events')
 const createMetamaskProvider = require('web3-provider-engine/zero.js')
-const SubproviderFromProvider = require('web3-provider-engine/subproviders/web3.js')
+const SubproviderFromProvider = require('web3-provider-engine/subproviders/provider.js')
 const createInfuraProvider = require('eth-json-rpc-infura/src/createProvider')
 const ObservableStore = require('obs-store')
 const ComposedStore = require('obs-store/lib/composed')

app/scripts/controllers/token-rates.js

@@ -39,7 +39,7 @@ class TokenRatesController {
    */
   async fetchExchangeRate (address) {
     try {
-      const response = await fetch(`https://metamask.dev.balanc3.net/prices?from=${address}&to=ETH&autoConversion=false&summaryOnly=true`)
+      const response = await fetch(`https://metamask.balanc3.net/prices?from=${address}&to=ETH&autoConversion=false&summaryOnly=true`)
       const json = await response.json()
       return json && json.length ? json[0].averagePrice : 0
     } catch (error) { }

notices/archive/notice_2.md

@@ -1,6 +1,6 @@
 MetaMask is beta software. 
 
-When you log in to MetaMask, your current account is visible to every new site you visit.
+When you log in to MetaMask, your current account's address is visible to every new site you visit. This can be used to look up your account balances of Ether and other tokens.
 
 For your privacy, for now, please sign out of MetaMask when you're done using a site.