aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers
diff options
context:
space:
mode:
authorChen Wei <chenwei@byzantine-lab.io>2019-07-02 15:44:40 +0800
committerChen Wei <chenwei@byzantine-lab.io>2019-07-02 15:44:40 +0800
commit852df543036aac5d0d24d3a31a24818ac4c114bd (patch)
treed8758b40eea4ea8bd35aaa2e7255621fffdd702b /app/scripts/controllers
parentffb58b74793e9b5d5caf36efdc5d7d3867c2e162 (diff)
downloadtangerine-wallet-browser-852df543036aac5d0d24d3a31a24818ac4c114bd.tar
tangerine-wallet-browser-852df543036aac5d0d24d3a31a24818ac4c114bd.tar.gz
tangerine-wallet-browser-852df543036aac5d0d24d3a31a24818ac4c114bd.tar.bz2
tangerine-wallet-browser-852df543036aac5d0d24d3a31a24818ac4c114bd.tar.lz
tangerine-wallet-browser-852df543036aac5d0d24d3a31a24818ac4c114bd.tar.xz
tangerine-wallet-browser-852df543036aac5d0d24d3a31a24818ac4c114bd.tar.zst
tangerine-wallet-browser-852df543036aac5d0d24d3a31a24818ac4c114bd.zip
revert replacing "ETH" with "TAN"
Diffstat (limited to 'app/scripts/controllers')
-rw-r--r--app/scripts/controllers/network/network.js10
-rw-r--r--app/scripts/controllers/token-rates.js2
2 files changed, 4 insertions, 8 deletions
diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js
index aec2bf560..01a283347 100644
--- a/app/scripts/controllers/network/network.js
+++ b/app/scripts/controllers/network/network.js
@@ -44,7 +44,7 @@ const defaultProviderConfig = {
}
const defaultNetworkConfig = {
- ticker: 'TAN',
+ ticker: 'ETH',
}
module.exports = class NetworkController extends EventEmitter {
@@ -132,7 +132,7 @@ module.exports = class NetworkController extends EventEmitter {
})
}
- setRpcTarget (rpcTarget, chainId, ticker = 'TAN', nickname = '', rpcPrefs) {
+ setRpcTarget (rpcTarget, chainId, ticker = 'ETH', nickname = '', rpcPrefs) {
const providerConfig = {
type: 'rpc',
rpcTarget,
@@ -144,10 +144,8 @@ module.exports = class NetworkController extends EventEmitter {
this.providerConfig = providerConfig
}
- async setProviderType (type, rpcTarget = '', ticker = 'TAN', nickname = '') {
- console.log('1')
+ async setProviderType (type, rpcTarget = '', ticker = 'ETH', nickname = '') {
assert.notEqual(type, 'rpc', `NetworkController - cannot call "setProviderType" with type 'rpc'. use "setRpcTarget"`)
- console.log('2')
if (INFURA_PROVIDER_TYPES.includes(type)) {
assert(INFURA_PROVIDER_TYPES.includes(type) || type === LOCALHOST, `NetworkController - Unknown rpc type "${type}"`)
@@ -155,7 +153,6 @@ module.exports = class NetworkController extends EventEmitter {
assert(TANGERINE_PROVIDER_TYPES.includes(type) || type === LOCALHOST, `NetworkController - Unknown rpc type "${type}"`)
}
const providerConfig = { type, rpcTarget, ticker, nickname }
- console.log('providerConfig', providerConfig)
this.providerConfig = providerConfig
}
@@ -188,7 +185,6 @@ module.exports = class NetworkController extends EventEmitter {
const isInfura = INFURA_PROVIDER_TYPES.includes(type)
const isTangerine = TANGERINE_PROVIDER_TYPES.includes(type)
- console.log('_configureProvider', opts, isTangerine)
if (isTangerine) {
this._configureTangerineProvider(opts)
} else if (isInfura) {
diff --git a/app/scripts/controllers/token-rates.js b/app/scripts/controllers/token-rates.js
index 70b8f64c7..9b86a9ebf 100644
--- a/app/scripts/controllers/token-rates.js
+++ b/app/scripts/controllers/token-rates.js
@@ -30,7 +30,7 @@ class TokenRatesController {
async updateExchangeRates () {
if (!this.isActive) { return }
const contractExchangeRates = {}
- const nativeCurrency = this.currency ? this.currency.state.nativeCurrency.toLowerCase() : 'TAN'
+ const nativeCurrency = this.currency ? this.currency.state.nativeCurrency.toLowerCase() : 'eth'
const pairs = this._tokens.map(token => token.address).join(',')
const query = `contract_addresses=${pairs}&vs_currencies=${nativeCurrency}`
if (this._tokens.length > 0) {