m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Missed modifications of t() in merge resolution.

Browse Source
This commit is contained in:
Dan 2018-03-21 22:54:52 -02:30
parent be845fd190
commit 6cbadc0aa3
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/app/components/network-display.js
View File

@ -3,7 +3,6 @@ const h = require('react-hyperscript')
const PropTypes = require('prop-types') const PropTypes = require('prop-types')
const { connect } = require('react-redux') const { connect } = require('react-redux')
const NetworkDropdownIcon = require('./dropdowns/components/network-dropdown-icon') const NetworkDropdownIcon = require('./dropdowns/components/network-dropdown-icon')
const t = require('../../i18n')
const networkToColorHash = { const networkToColorHash = {
1: '#038789', 1: '#038789',
@ -31,7 +30,7 @@ class NetworkDisplay extends Component {
const { provider: { type } } = this.props const { provider: { type } } = this.props
return h('.network-display__container', [ return h('.network-display__container', [
this.renderNetworkIcon(), this.renderNetworkIcon(),
h('.network-name', t(type)), h('.network-name', this.props.t(type)),
]) ])
} }
} }

1
ui/app/components/pending-tx/confirm-deploy-contract.js
View File

@ -8,7 +8,6 @@ const ethUtil = require('ethereumjs-util')
const BN = ethUtil.BN const BN = ethUtil.BN
const hexToBn = require('../../../../app/scripts/lib/hex-to-bn') const hexToBn = require('../../../../app/scripts/lib/hex-to-bn')
const { conversionUtil } = require('../../conversion-util') const { conversionUtil } = require('../../conversion-util')
const t = require('../../../i18n')
const SenderToRecipient = require('../sender-to-recipient') const SenderToRecipient = require('../sender-to-recipient')
const NetworkDisplay = require('../network-display') const NetworkDisplay = require('../network-display')

1
ui/app/components/pending-tx/confirm-send-ether.js
View File

@ -13,7 +13,6 @@ const {
multiplyCurrencies, multiplyCurrencies,
} = require('../../conversion-util') } = require('../../conversion-util')
const GasFeeDisplay = require('../send/gas-fee-display-v2') const GasFeeDisplay = require('../send/gas-fee-display-v2')
const t = require('../../../i18n')
const SenderToRecipient = require('../sender-to-recipient') const SenderToRecipient = require('../sender-to-recipient')
const NetworkDisplay = require('../network-display') const NetworkDisplay = require('../network-display')