Merge branch 'i3725-refactor-send-component-' into i3725-refactor-send-component-2

2 files changed, 11 insertions, 11 deletions

diff --git a/ui/app/components/send_/send-header/send-header.component.js b/ui/app/components/send_/send-header/send-header.component.js
index 99adfc7e8..dc4190b93 100644
--- a/ui/app/components/send_/send-header/send-header.component.js
+++ b/ui/app/components/send_/send-header/send-header.component.js
@@ -1,28 +1,29 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
-import PageContainerHeader from '../../page-container/page-container-header.component'
+import PageContainerHeader from '../../page-container/page-container-header'
+import { DEFAULT_ROUTE } from '../../../routes'
 
 export default class SendHeader extends Component {
 
   static propTypes = {
-    isToken: PropTypes.bool,
     clearSend: PropTypes.func,
-    goHome: PropTypes.func,
+    history: PropTypes.object,
+    isToken: PropTypes.bool,
   };
 
   render () {
-    const { isToken, clearSend, goHome } = this.props
+    const { isToken, clearSend, history } = this.props
 
     return (
       <PageContainerHeader
-        title={isToken ? this.context.t('sendTokens') : this.context.t('sendETH')}
-        subtitle={this.context.t('onlySendToEtherAddress')}
         onClose={() => {
           clearSend()
-          goHome()
+          history.push(DEFAULT_ROUTE)
         }}
+        subtitle={this.context.t('onlySendToEtherAddress')}
+        title={isToken ? this.context.t('sendTokens') : this.context.t('sendETH')}
       />
-    );
+    )
   }
 
 }
diff --git a/ui/app/components/send_/send-header/send-header.container.js b/ui/app/components/send_/send-header/send-header.container.js
index a4d3ac54f..0c92da3a6 100644
--- a/ui/app/components/send_/send-header/send-header.container.js
+++ b/ui/app/components/send_/send-header/send-header.container.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux'
-import { goHome, clearSend } from '../../../actions'
+import { clearSend } from '../../../actions'
 import SendHeader from './send-header.component'
 import { getSelectedToken } from '../../../selectors'
 
@@ -7,13 +7,12 @@ export default connect(mapStateToProps, mapDispatchToProps)(SendHeader)
 
 function mapStateToProps (state) {
   return {
-    isToken: Boolean(getSelectedToken(state))
+    isToken: Boolean(getSelectedToken(state)),
   }
 }
 
 function mapDispatchToProps (dispatch) {
   return {
-    goHome: () => dispatch(goHome()),
     clearSend: () => dispatch(clearSend()),
   }
 }