mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Fix font sizes, colors. Include data tab for send-eth transaction confirmations that have data
This commit is contained in:
parent
92fc87a231
commit
67017711df
@ -13,6 +13,6 @@
|
|||||||
|
|
||||||
&__warning {
|
&__warning {
|
||||||
font-size: .75rem;
|
font-size: .75rem;
|
||||||
color: $oslo-gray;
|
color: #5f5922;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&__name {
|
&__name {
|
||||||
font-size: .875rem;
|
font-size: .75rem;
|
||||||
padding-left: 5px;
|
padding-left: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11,6 +11,7 @@ export default class ConfirmSendEther extends Component {
|
|||||||
static propTypes = {
|
static propTypes = {
|
||||||
editTransaction: PropTypes.func,
|
editTransaction: PropTypes.func,
|
||||||
history: PropTypes.object,
|
history: PropTypes.object,
|
||||||
|
txParams: PropTypes.object,
|
||||||
}
|
}
|
||||||
|
|
||||||
handleEdit ({ txData }) {
|
handleEdit ({ txData }) {
|
||||||
@ -19,11 +20,18 @@ export default class ConfirmSendEther extends Component {
|
|||||||
history.push(SEND_ROUTE)
|
history.push(SEND_ROUTE)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
shouldHideData () {
|
||||||
|
const { txParams = {} } = this.props
|
||||||
|
return !txParams.data
|
||||||
|
}
|
||||||
|
|
||||||
render () {
|
render () {
|
||||||
|
const hideData = this.shouldHideData()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ConfirmTransactionBase
|
<ConfirmTransactionBase
|
||||||
action={this.context.t('confirm')}
|
action={this.context.t('confirm')}
|
||||||
hideData
|
hideData={hideData}
|
||||||
onEdit={confirmTransactionData => this.handleEdit(confirmTransactionData)}
|
onEdit={confirmTransactionData => this.handleEdit(confirmTransactionData)}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
|
@ -5,6 +5,14 @@ import { updateSend } from '../../../actions'
|
|||||||
import { clearConfirmTransaction } from '../../../ducks/confirm-transaction.duck'
|
import { clearConfirmTransaction } from '../../../ducks/confirm-transaction.duck'
|
||||||
import ConfirmSendEther from './confirm-send-ether.component'
|
import ConfirmSendEther from './confirm-send-ether.component'
|
||||||
|
|
||||||
|
const mapStateToProps = state => {
|
||||||
|
const { confirmTransaction: { txData: { txParams } = {} } } = state
|
||||||
|
|
||||||
|
return {
|
||||||
|
txParams,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const mapDispatchToProps = dispatch => {
|
const mapDispatchToProps = dispatch => {
|
||||||
return {
|
return {
|
||||||
editTransaction: txData => {
|
editTransaction: txData => {
|
||||||
@ -33,5 +41,5 @@ const mapDispatchToProps = dispatch => {
|
|||||||
|
|
||||||
export default compose(
|
export default compose(
|
||||||
withRouter,
|
withRouter,
|
||||||
connect(null, mapDispatchToProps)
|
connect(mapStateToProps, mapDispatchToProps)
|
||||||
)(ConfirmSendEther)
|
)(ConfirmSendEther)
|
||||||
|
Loading…
Reference in New Issue
Block a user