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

Merge pull request #6545 from whymarrh/tOrKey-ConfirmTransactionBase

Browse Source 
Use tOrKey for actionKey in ConfirmTransactionBase
This commit is contained in:
Thomas Huang 2019-05-01 11:39:44 -07:00 committed by GitHub
commit 2ff522604b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/helpers/higher-order-components/i18n-provider.js
View File

@ -19,7 +19,7 @@ class I18nProvider extends Component {
return t(current, key, ...args) || t(en, key, ...args) || `[${key}]` return t(current, key, ...args) || t(en, key, ...args) || `[${key}]`
}, },
tOrDefault: this.tOrDefault, tOrDefault: this.tOrDefault,
tOrKey (key, ...args) { tOrKey: (key, ...args) => {
return this.tOrDefault(key, key, ...args) return this.tOrDefault(key, key, ...args)
}, },
} }

4
ui/app/pages/confirm-transaction-base/confirm-transaction-base.component.js
View File

@ -18,6 +18,7 @@ import AdvancedGasInputs from '../../components/app/gas-customization/advanced-g
export default class ConfirmTransactionBase extends Component { export default class ConfirmTransactionBase extends Component {
static contextTypes = { static contextTypes = {
t: PropTypes.func, t: PropTypes.func,
tOrKey: PropTypes.func.isRequired,
metricsEvent: PropTypes.func, metricsEvent: PropTypes.func,
} }
@ -546,7 +547,8 @@ export default class ConfirmTransactionBase extends Component {
toName={toName} toName={toName}
toAddress={toAddress} toAddress={toAddress}
showEdit={onEdit && !isTxReprice} showEdit={onEdit && !isTxReprice}
action={this.context.t(actionKey) || getMethodName(name) || this.context.t('contractInteraction')} // In the event that the key is falsy (and inherently invalid), use a fallback string
action={this.context.tOrKey(actionKey) || getMethodName(name) || this.context.t('contractInteraction')}
title={title} title={title}
titleComponent={this.renderTitleComponent()} titleComponent={this.renderTitleComponent()}
subtitle={subtitle} subtitle={subtitle}