diff options
author | Thomas Huang <tmashuang@users.noreply.github.com> | 2018-04-27 05:16:35 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-27 05:16:35 +0800 |
commit | 4e7b0ff15c5a57cd58497aa292c884a97e8a5d23 (patch) | |
tree | b0d825eac0e2c187c89aacba0df2d7d2a9d44131 /app | |
parent | dcd04091cc0149cbb0a49bfdf7897e2ac480c7bc (diff) | |
parent | b97457e9e2b74ca1bffc7655568e4f61dba1c409 (diff) | |
download | tangerine-wallet-browser-4e7b0ff15c5a57cd58497aa292c884a97e8a5d23.tar tangerine-wallet-browser-4e7b0ff15c5a57cd58497aa292c884a97e8a5d23.tar.gz tangerine-wallet-browser-4e7b0ff15c5a57cd58497aa292c884a97e8a5d23.tar.bz2 tangerine-wallet-browser-4e7b0ff15c5a57cd58497aa292c884a97e8a5d23.tar.lz tangerine-wallet-browser-4e7b0ff15c5a57cd58497aa292c884a97e8a5d23.tar.xz tangerine-wallet-browser-4e7b0ff15c5a57cd58497aa292c884a97e8a5d23.tar.zst tangerine-wallet-browser-4e7b0ff15c5a57cd58497aa292c884a97e8a5d23.zip |
Merge pull request #4095 from MetaMask/v4.6.0v4.6.0
Version 4.6.0
Diffstat (limited to 'app')
-rw-r--r-- | app/manifest.json | 2 | ||||
-rw-r--r-- | app/scripts/controllers/network/network.js | 2 | ||||
-rw-r--r-- | app/scripts/controllers/token-rates.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/manifest.json b/app/manifest.json index dc46f1ca4..3e5eed205 100644 --- a/app/manifest.json +++ b/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__", diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js index 6fd983bb2..2f5b81cd2 100644 --- a/app/scripts/controllers/network/network.js +++ b/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') diff --git a/app/scripts/controllers/token-rates.js b/app/scripts/controllers/token-rates.js index 21384f262..abeec4cc0 100644 --- a/app/scripts/controllers/token-rates.js +++ b/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) { } |