3 files changed, 27 insertions, 15 deletions
diff --git a/ui/app/pages/send/send-header/send-header.component.js b/ui/app/pages/send/send-header/send-header.component.js
index 76e35494a..5bc76fcd3 100644
--- a/ui/app/pages/send/send-header/send-header.component.js
+++ b/ui/app/pages/send/send-header/send-header.component.js
@@ -24,8 +24,10 @@ export default class SendHeader extends Component {
   render () {
     return (
       <PageContainerHeader
+        className="send__header"
         onClose={() => this.onClose()}
         title={this.context.t(this.props.titleKey)}
+        headerCloseText={this.context.t('cancel')}
       />
     )
   }
diff --git a/ui/app/pages/send/send-header/send-header.selectors.js b/ui/app/pages/send/send-header/send-header.selectors.js
index d7c9d3766..01b90409b 100644
--- a/ui/app/pages/send/send-header/send-header.selectors.js
+++ b/ui/app/pages/send/send-header/send-header.selectors.js
@@ -1,6 +1,7 @@
 const {
   getSelectedToken,
   getSendEditingTransactionId,
+  getSendTo,
 } = require('../send.selectors.js')
 
 const selectors = {
@@ -14,6 +15,10 @@ function getTitleKey (state) {
   const isEditing = Boolean(getSendEditingTransactionId(state))
   const isToken = Boolean(getSelectedToken(state))
 
+  if (!getSendTo(state)) {
+    return 'addRecipient'
+  }
+
   if (isEditing) {
     return 'edit'
   } else if (isToken) {
@@ -24,14 +29,14 @@ function getTitleKey (state) {
 }
 
 function getSubtitleParams (state) {
-    const isEditing = Boolean(getSendEditingTransactionId(state))
-    const token = getSelectedToken(state)
+  const isEditing = Boolean(getSendEditingTransactionId(state))
+  const token = getSelectedToken(state)
 
-    if (isEditing) {
-      return [ 'editingTransaction' ]
-    } else if (token) {
-      return [ 'onlySendTokensToAccountAddress', [ token.symbol ] ]
-    } else {
-      return [ 'onlySendToEtherAddress' ]
-    }
+  if (isEditing) {
+    return [ 'editingTransaction' ]
+  } else if (token) {
+    return [ 'onlySendTokensToAccountAddress', [ token.symbol ] ]
+  } else {
+    return [ 'onlySendToEtherAddress' ]
+  }
 }
diff --git a/ui/app/pages/send/send-header/tests/send-header-selectors.test.js b/ui/app/pages/send/send-header/tests/send-header-selectors.test.js
index e0c6a3ab3..d22845f84 100644
--- a/ui/app/pages/send/send-header/tests/send-header-selectors.test.js
+++ b/ui/app/pages/send/send-header/tests/send-header-selectors.test.js
@@ -8,39 +8,44 @@ const {
   '../send.selectors': {
     getSelectedToken: (mockState) => mockState.t,
     getSendEditingTransactionId: (mockState) => mockState.e,
+    getSendTo: (mockState) => mockState.to,
   },
 })
 
 describe('send-header selectors', () => {
 
   describe('getTitleKey()', () => {
+    it('should return the correct key when "to" is empty', () => {
+      assert.equal(getTitleKey({ e: 1, t: true, to: '' }), 'addRecipient')
+    })
+
     it('should return the correct key when getSendEditingTransactionId is truthy', () => {
-      assert.equal(getTitleKey({ e: 1, t: true }), 'edit')
+      assert.equal(getTitleKey({ e: 1, t: true, to: '0x123' }), 'edit')
     })
 
     it('should return the correct key when getSendEditingTransactionId is falsy and getSelectedToken is truthy', () => {
-      assert.equal(getTitleKey({ e: null, t: 'abc' }), 'sendTokens')
+      assert.equal(getTitleKey({ e: null, t: 'abc', to: '0x123' }), 'sendTokens')
     })
 
     it('should return the correct key when getSendEditingTransactionId is falsy and getSelectedToken is falsy', () => {
-      assert.equal(getTitleKey({ e: null }), 'sendETH')
+      assert.equal(getTitleKey({ e: null, to: '0x123' }), 'sendETH')
     })
   })
 
   describe('getSubtitleParams()', () => {
     it('should return the correct params when getSendEditingTransactionId is truthy', () => {
-      assert.deepEqual(getSubtitleParams({ e: 1, t: true }), [ 'editingTransaction' ])
+      assert.deepEqual(getSubtitleParams({ e: 1, t: true, to: '0x123' }), [ 'editingTransaction' ])
     })
 
     it('should return the correct params when getSendEditingTransactionId is falsy and getSelectedToken is truthy', () => {
       assert.deepEqual(
-        getSubtitleParams({ e: null, t: { symbol: 'ABC' } }),
+        getSubtitleParams({ e: null, t: { symbol: 'ABC' }, to: '0x123' }),
         [ 'onlySendTokensToAccountAddress', [ 'ABC' ] ]
       )
     })
 
     it('should return the correct params when getSendEditingTransactionId is falsy and getSelectedToken is falsy', () => {
-      assert.deepEqual(getSubtitleParams({ e: null }), [ 'onlySendToEtherAddress' ])
+      assert.deepEqual(getSubtitleParams({ e: null, to: '0x123' }), [ 'onlySendToEtherAddress' ])
     })
   })