diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/index.scss b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/index.scss index 189a5c5c6..50545a1a2 100644 --- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/index.scss +++ b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-warning/index.scss @@ -13,6 +13,6 @@ &__warning { font-size: .75rem; - color: $oslo-gray; + color: #5f5922; } } diff --git a/ui/app/components/network-display/index.scss b/ui/app/components/network-display/index.scss index 3bce81aaa..e82d0e70c 100644 --- a/ui/app/components/network-display/index.scss +++ b/ui/app/components/network-display/index.scss @@ -26,7 +26,7 @@ } &__name { - font-size: .875rem; + font-size: .75rem; padding-left: 5px; } diff --git a/ui/app/components/pages/confirm-send-ether/confirm-send-ether.component.js b/ui/app/components/pages/confirm-send-ether/confirm-send-ether.component.js index c590bacf3..442a478b8 100644 --- a/ui/app/components/pages/confirm-send-ether/confirm-send-ether.component.js +++ b/ui/app/components/pages/confirm-send-ether/confirm-send-ether.component.js @@ -11,6 +11,7 @@ export default class ConfirmSendEther extends Component { static propTypes = { editTransaction: PropTypes.func, history: PropTypes.object, + txParams: PropTypes.object, } handleEdit ({ txData }) { @@ -19,11 +20,18 @@ export default class ConfirmSendEther extends Component { history.push(SEND_ROUTE) } + shouldHideData () { + const { txParams = {} } = this.props + return !txParams.data + } + render () { + const hideData = this.shouldHideData() + return ( this.handleEdit(confirmTransactionData)} /> ) diff --git a/ui/app/components/pages/confirm-send-ether/confirm-send-ether.container.js b/ui/app/components/pages/confirm-send-ether/confirm-send-ether.container.js index 898735d1a..e48ef54a8 100644 --- a/ui/app/components/pages/confirm-send-ether/confirm-send-ether.container.js +++ b/ui/app/components/pages/confirm-send-ether/confirm-send-ether.container.js @@ -5,6 +5,14 @@ import { updateSend } from '../../../actions' import { clearConfirmTransaction } from '../../../ducks/confirm-transaction.duck' import ConfirmSendEther from './confirm-send-ether.component' +const mapStateToProps = state => { + const { confirmTransaction: { txData: { txParams } = {} } } = state + + return { + txParams, + } +} + const mapDispatchToProps = dispatch => { return { editTransaction: txData => { @@ -33,5 +41,5 @@ const mapDispatchToProps = dispatch => { export default compose( withRouter, - connect(null, mapDispatchToProps) + connect(mapStateToProps, mapDispatchToProps) )(ConfirmSendEther)