Merge pull request #6969 from MetaMask/developv7.0.0

Master Version Bump

1 files changed, 37 insertions, 12 deletions

diff --git a/ui/app/pages/send/send-content/send-content.component.js b/ui/app/pages/send/send-content/send-content.component.js
index d799806c7..aff675e7a 100644
--- a/ui/app/pages/send/send-content/send-content.component.js
+++ b/ui/app/pages/send/send-content/send-content.component.js
@@ -2,18 +2,25 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import PageContainerContent from '../../../components/ui/page-container/page-container-content.component'
 import SendAmountRow from './send-amount-row'
-import SendFromRow from './send-from-row'
 import SendGasRow from './send-gas-row'
 import SendHexDataRow from './send-hex-data-row'
-import SendToRow from './send-to-row'
 import SendAssetRow from './send-asset-row'
+import Dialog from '../../../components/ui/dialog'
 
 export default class SendContent extends Component {
 
+  static contextTypes = {
+    t: PropTypes.func,
+  }
+
   static propTypes = {
     updateGas: PropTypes.func,
     scanQrCode: PropTypes.func,
+    showAddToAddressBookModal: PropTypes.func,
     showHexData: PropTypes.bool,
+    to: PropTypes.string,
+    ownedAccounts: PropTypes.array,
+    addressBook: PropTypes.array,
   }
 
   updateGas = (updateData) => this.props.updateGas(updateData)
@@ -22,22 +29,40 @@ export default class SendContent extends Component {
     return (
       <PageContainerContent>
         <div className="send-v2__form">
-          <SendFromRow />
-          <SendToRow
-            updateGas={this.updateGas}
-            scanQrCode={ _ => this.props.scanQrCode()}
-          />
+          { this.maybeRenderAddContact() }
           <SendAssetRow />
           <SendAmountRow updateGas={this.updateGas} />
           <SendGasRow />
-          {(this.props.showHexData && (
-            <SendHexDataRow
-              updateGas={this.updateGas}
-            />
-          ))}
+          {
+            this.props.showHexData && (
+              <SendHexDataRow
+                updateGas={this.updateGas}
+              />
+            )
+          }
         </div>
       </PageContainerContent>
     )
   }
 
+  maybeRenderAddContact () {
+    const { t } = this.context
+    const { to, addressBook = [], ownedAccounts = [], showAddToAddressBookModal } = this.props
+    const isOwnedAccount = !!ownedAccounts.find(({ address }) => address.toLowerCase() === to.toLowerCase())
+    const contact = addressBook.find(({ address }) => address === to) || {}
+
+    if (isOwnedAccount || contact.name) {
+      return
+    }
+
+    return (
+      <Dialog
+        type="message"
+        className="send__dialog"
+        onClick={showAddToAddressBookModal}
+      >
+        {t('newAccountDetectedDialogMessage')}
+      </Dialog>
+    )
+  }
 }