Missed modifications of t() in merge resolution.

feature/default_network_editable
Dan 7 years ago
parent be845fd190
commit 6cbadc0aa3
  1. 3
      ui/app/components/network-display.js
  2. 1
      ui/app/components/pending-tx/confirm-deploy-contract.js
  3. 1
      ui/app/components/pending-tx/confirm-send-ether.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)),
])
}
}

@ -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')

@ -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')

Loading…
Cancel
Save