aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-03-22 09:24:52 +0800
committerDan <danjm.com@gmail.com>2018-03-22 09:24:52 +0800
commit6cbadc0aa342550654cbdb00c3b276542fbd19c5 (patch)
treea15b5cf2e5295b1c66045a1dd4bed80828b83cb1
parentbe845fd190ee71d2bb6e641a5c23c453668268e3 (diff)
downloadtangerine-wallet-browser-6cbadc0aa342550654cbdb00c3b276542fbd19c5.tar
tangerine-wallet-browser-6cbadc0aa342550654cbdb00c3b276542fbd19c5.tar.gz
tangerine-wallet-browser-6cbadc0aa342550654cbdb00c3b276542fbd19c5.tar.bz2
tangerine-wallet-browser-6cbadc0aa342550654cbdb00c3b276542fbd19c5.tar.lz
tangerine-wallet-browser-6cbadc0aa342550654cbdb00c3b276542fbd19c5.tar.xz
tangerine-wallet-browser-6cbadc0aa342550654cbdb00c3b276542fbd19c5.tar.zst
tangerine-wallet-browser-6cbadc0aa342550654cbdb00c3b276542fbd19c5.zip
Missed modifications of t() in merge resolution.
-rw-r--r--ui/app/components/network-display.js3
-rw-r--r--ui/app/components/pending-tx/confirm-deploy-contract.js1
-rw-r--r--ui/app/components/pending-tx/confirm-send-ether.js1
3 files changed, 1 insertions, 4 deletions
diff --git a/ui/app/components/network-display.js b/ui/app/components/network-display.js
index 9dc31b5c7..0bc5cdaf8 100644
--- a/ui/app/components/network-display.js
+++ b/ui/app/components/network-display.js
@@ -3,7 +3,6 @@ const h = require('react-hyperscript')
const PropTypes = require('prop-types')
const { connect } = require('react-redux')
const NetworkDropdownIcon = require('./dropdowns/components/network-dropdown-icon')
-const t = require('../../i18n')
const networkToColorHash = {
1: '#038789',
@@ -31,7 +30,7 @@ class NetworkDisplay extends Component {
const { provider: { type } } = this.props
return h('.network-display__container', [
this.renderNetworkIcon(),
- h('.network-name', t(type)),
+ h('.network-name', this.props.t(type)),
])
}
}
diff --git a/ui/app/components/pending-tx/confirm-deploy-contract.js b/ui/app/components/pending-tx/confirm-deploy-contract.js
index 512aa793d..60afdc7ae 100644
--- a/ui/app/components/pending-tx/confirm-deploy-contract.js
+++ b/ui/app/components/pending-tx/confirm-deploy-contract.js
@@ -8,7 +8,6 @@ const ethUtil = require('ethereumjs-util')
const BN = ethUtil.BN
const hexToBn = require('../../../../app/scripts/lib/hex-to-bn')
const { conversionUtil } = require('../../conversion-util')
-const t = require('../../../i18n')
const SenderToRecipient = require('../sender-to-recipient')
const NetworkDisplay = require('../network-display')
diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js
index 68c6f14d2..b76dc94d8 100644
--- a/ui/app/components/pending-tx/confirm-send-ether.js
+++ b/ui/app/components/pending-tx/confirm-send-ether.js
@@ -13,7 +13,6 @@ const {
multiplyCurrencies,
} = require('../../conversion-util')
const GasFeeDisplay = require('../send/gas-fee-display-v2')
-const t = require('../../../i18n')
const SenderToRecipient = require('../sender-to-recipient')
const NetworkDisplay = require('../network-display')