Address book send plus contact list

app/_locales/en/messages.json

@@ -80,12 +80,21 @@
   "activityLog": {
     "message": "activity log"
   },
+  "add": {
+    "message": "Add"
+  },
   "address": {
     "message": "Address"
   },
   "addNetwork": {
     "message": "Add Network"
   },
+  "addRecipient": {
+    "message": "Add Recipient"
+  },
+  "addressBook": {
+    "message": "Address Book"
+  },
   "advanced": {
     "message": "Advanced"
   },
@@ -98,6 +107,18 @@
   "addCustomToken": {
     "message": "Add custom token"
   },
+  "addToAddressBook": {
+    "message": "Add to address book"
+  },
+  "addToAddressBookModalPlaceholder": {
+    "message": "e.g. John D."
+  },
+  "addAlias": {
+    "message": "Add alias"
+  },
+  "addEthAddress": {
+    "message": "Add an Ethereum address"
+  },
   "addToken": {
     "message": "Add Token"
   },
@@ -172,6 +193,9 @@
   "back": {
     "message": "Back"
   },
+  "backToAll": {
+    "message": "Back to All"
+  },
   "balance": {
     "message": "Balance"
   },
@@ -354,6 +378,12 @@
   "connectToTrezor": {
     "message": "Connect to Trezor"
   },
+  "contactList": {
+    "message": "Contact List"
+  },
+  "contactListDescription": {
+    "message": "Add, edit, remove, and manage your contacts"
+  },
   "continue": {
     "message": "Continue"
   },
@@ -463,6 +493,9 @@
   "delete": {
     "message": "Delete"
   },
+  "deleteAccount": {
+    "message": "Delete Account"
+  },
   "denExplainer": {
     "message": "Your DEN is your password-encrypted storage within MetaMask."
   },
@@ -529,6 +562,9 @@
   "editAccountName": {
     "message": "Edit Account Name"
   },
+  "editContact":{
+    "message": "Edit Contact"
+  },
   "editingTransaction": {
     "message": "Make changes to your transaction"
   },
@@ -571,6 +607,15 @@
   "ensNameNotFound": {
     "message": "ENS name not found"
   },
+  "ensRegistrationError": {
+    "message": "Error in ENS name registration"
+  },
+  "ensNotFoundOnCurrentNetwork": {
+    "message": "ENS name not found on the current network. Try switching to Main Ethereum Network."
+  },
+  "enterAnAlias": {
+    "message": "Enter an alias"
+  },
   "enterPassword": {
     "message": "Enter password"
   },
@@ -583,6 +628,9 @@
   "eth": {
     "message": "ETH"
   },
+  "ethereumPublicAddress": {
+    "message": "Ethereum Public Address"
+  },
   "etherscanView": {
     "message": "View account on Etherscan"
   },
@@ -893,6 +941,9 @@
   "loadingTokens": {
     "message": "Loading Tokens..."
   },
+  "loadMore": {
+    "message": "Load More"
+  },
   "localhost": {
     "message": "Localhost 8545"
   },
@@ -914,6 +965,9 @@
   "memorizePhrase": {
     "message": "Memorize this phrase."
   },
+  "memo": {
+    "message": "memo"
+  },
   "menu": {
     "message": "Menu"
   },
@@ -947,6 +1001,12 @@
   "myAccounts": {
     "message": "My Accounts"
   },
+  "myWalletAccounts": {
+    "message": "My Wallet Accounts"
+  },
+  "myWalletAccountsDescription": {
+    "message": "All of your MetaMask created accounts will automatically be added to this section."
+  },
   "mustSelectOne": {
     "message": "Must select at least 1 token."
   },
@@ -979,10 +1039,16 @@
   "newAccount": {
     "message": "New Account"
   },
+  "newAccountDetectedDialogMessage": {
+    "message": "New address detected! Click here to add to your address book."
+  },
   "newAccountNumberName": {
     "message": "Account $1",
     "description": "Default name of next account to be created on create account screen"
   },
+  "newContact": {
+    "message": "New Contact"
+  },
   "newContract": {
     "message": "New Contract"
   },
@@ -1193,9 +1259,15 @@
   "receive": {
     "message": "Receive"
   },
+  "recents": {
+    "message": "Recents"
+  },
   "recipientAddress": {
     "message": "Recipient Address"
   },
+  "recipientAddressPlaceholder": {
+    "message": "Search, public address (0x), or ENS"
+  },
   "refundAddress": {
     "message": "Your Refund Address"
   },
@@ -1670,6 +1742,9 @@
   "transfer": {
     "message": "Transfer"
   },
+  "transferBetweenAccounts": {
+    "message": "Transfer between my accounts"
+  },
   "transferFrom": {
     "message": "Transfer From"
   },
@@ -1750,6 +1825,9 @@
   "useOldUI": {
     "message": "Use old UI"
   },
+  "userName":{
+    "message": "Username"
+  },
   "validFileImport": {
     "message": "You must select a valid file to import."
   },
@@ -1762,6 +1840,9 @@
   "viewinExplorer": {
     "message": "View in Explorer"
   },
+  "viewContact": {
+    "message": "View Contact"
+  },
   "viewOnCustomBlockExplorer": {
     "message": "View at $1"
   },

app/scripts/metamask-controller.js

@@ -460,6 +460,7 @@ module.exports = class MetamaskController extends EventEmitter {
 
       // AddressController
       setAddressBook: this.addressBookController.set.bind(this.addressBookController),
+      removeFromAddressBook: this.addressBookController.delete.bind(this.addressBookController),
 
       // AppStateController
       setLastActiveTime: nodeify(this.appStateController.setLastActiveTime, this.appStateController),

package.json

@@ -101,7 +101,7 @@
     "extensionizer": "^1.0.1",
     "fast-json-patch": "^2.0.4",
     "fuse.js": "^3.2.0",
-    "gaba": "^1.4.1",
+    "gaba": "^1.5.0",
     "human-standard-token-abi": "^2.0.0",
     "jazzicon": "^1.2.0",
     "json-rpc-engine": "^4.0.0",

test/data/mock-state.json

@@ -119,7 +119,8 @@
     "addressBook": [
       {
         "address": "0xc42edfcc21ed14dda456aa0756c153f7985d8813",
-        "name": ""
+        "name": "",
+        "chainId": 4
       }
     ],
     "selectedTokenAddress": "0x108cf70c7d384c552f42c07c41c0e1e46d77ea0d",

test/e2e/from-import-ui.spec.js

@@ -255,9 +255,14 @@ describe('Using MetaMask with an existing account', function () {
       await sendButton.click()
       await delay(regularDelayMs)
 
-      const inputAddress = await findElement(driver, By.css('input[placeholder="Recipient Address"]'))
-      const inputAmount = await findElement(driver, By.css('.unit-input__input'))
+      const inputAddress = await findElement(driver, By.css('input[placeholder="Search, public address (0x), or ENS"]'))
       await inputAddress.sendKeys('0x2f318C334780961FB129D2a6c30D0763d9a5C970')
+
+      const recipientRow = await findElement(driver, By.css('.send__select-recipient-wrapper__group-item'))
+      await recipientRow.click()
+      await delay(regularDelayMs)
+
+      const inputAmount = await findElement(driver, By.css('.unit-input__input'))
       await inputAmount.sendKeys('1')
 
       // Set the gas limit

test/e2e/metamask-responsive-ui.spec.js

@@ -276,9 +276,14 @@ describe('MetaMask', function () {
       await sendButton.click()
       await delay(regularDelayMs)
 
-      const inputAddress = await findElement(driver, By.css('input[placeholder="Recipient Address"]'))
-      const inputAmount = await findElement(driver, By.css('.unit-input__input'))
+      const inputAddress = await findElement(driver, By.css('input[placeholder="Search, public address (0x), or ENS"]'))
       await inputAddress.sendKeys('0x2f318C334780961FB129D2a6c30D0763d9a5C970')
+
+      const recipientRow = await findElement(driver, By.css('.send__select-recipient-wrapper__group-item'))
+      await recipientRow.click()
+      await delay(regularDelayMs)
+
+      const inputAmount = await findElement(driver, By.css('.unit-input__input'))
       await inputAmount.sendKeys('1')
 
       const inputValue = await inputAmount.getAttribute('value')

test/e2e/metamask-ui.spec.js

@@ -322,12 +322,44 @@ describe('MetaMask', function () {
       await sendButton.click()
       await delay(regularDelayMs)
 
-      const inputAddress = await findElement(driver, By.css('input[placeholder="Recipient Address"]'))
-      const inputAmount = await findElement(driver, By.css('.unit-input__input'))
+      const inputAddress = await findElement(driver, By.css('input[placeholder="Search, public address (0x), or ENS"]'))
       await inputAddress.sendKeys('0x2f318C334780961FB129D2a6c30D0763d9a5C970')
+
+      const recipientRow = await findElement(driver, By.css('.send__select-recipient-wrapper__group-item'))
+      await recipientRow.click()
+      await delay(regularDelayMs)
+
+      const inputAmount = await findElement(driver, By.css('.unit-input__input'))
+      await inputAmount.sendKeys('1000')
+
+      const errorAmount = await findElement(driver, By.css('.send-v2__error-amount'))
+      assert.equal(await errorAmount.getText(), 'Insufficient funds.', 'send screen should render an insufficient fund error message')
+
+      await inputAmount.sendKeys(Key.BACK_SPACE)
+      await delay(50)
+      await inputAmount.sendKeys(Key.BACK_SPACE)
+      await delay(50)
+      await inputAmount.sendKeys(Key.BACK_SPACE)
+      await delay(tinyDelayMs)
+
+      await assertElementNotPresent(webdriver, driver, By.css('.send-v2__error-amount'))
+
+      const amountMax = await findElement(driver, By.css('.send-v2__amount-max'))
+      await amountMax.click()
+
+      assert.equal(await inputAmount.isEnabled(), false)
+
+      let inputValue = await inputAmount.getAttribute('value')
+
+      assert(Number(inputValue) > 99)
+
+      await amountMax.click()
+
+      assert.equal(await inputAmount.isEnabled(), true)
+
       await inputAmount.sendKeys('1')
 
-      const inputValue = await inputAmount.getAttribute('value')
+      inputValue = await inputAmount.getAttribute('value')
       assert.equal(inputValue, '1')
       await delay(regularDelayMs)
 
@@ -360,9 +392,14 @@ describe('MetaMask', function () {
       await sendButton.click()
       await delay(regularDelayMs)
 
-      const inputAddress = await findElement(driver, By.css('input[placeholder="Recipient Address"]'))
-      const inputAmount = await findElement(driver, By.css('.unit-input__input'))
+      const inputAddress = await findElement(driver, By.css('input[placeholder="Search, public address (0x), or ENS"]'))
       await inputAddress.sendKeys('0x2f318C334780961FB129D2a6c30D0763d9a5C970')
+
+      const recipientRow = await findElement(driver, By.css('.send__select-recipient-wrapper__group-item'))
+      await recipientRow.click()
+      await delay(regularDelayMs)
+
+      const inputAmount = await findElement(driver, By.css('.unit-input__input'))
       await inputAmount.sendKeys('1')
 
       const inputValue = await inputAmount.getAttribute('value')
@@ -402,9 +439,14 @@ describe('MetaMask', function () {
       await sendButton.click()
       await delay(regularDelayMs)
 
-      const inputAddress = await findElement(driver, By.css('input[placeholder="Recipient Address"]'))
-      const inputAmount = await findElement(driver, By.css('.unit-input__input'))
+      const inputAddress = await findElement(driver, By.css('input[placeholder="Search, public address (0x), or ENS"]'))
       await inputAddress.sendKeys('0x2f318C334780961FB129D2a6c30D0763d9a5C970')
+
+      const recipientRow = await findElement(driver, By.css('.send__select-recipient-wrapper__group-item'))
+      await recipientRow.click()
+      await delay(regularDelayMs)
+
+      const inputAmount = await findElement(driver, By.css('.unit-input__input'))
       await inputAmount.sendKeys('1')
 
       const inputValue = await inputAmount.getAttribute('value')
@@ -1005,9 +1047,14 @@ describe('MetaMask', function () {
       await sendButton.click()
       await delay(regularDelayMs)
 
-      const inputAddress = await findElement(driver, By.css('input[placeholder="Recipient Address"]'))
-      const inputAmount = await findElement(driver, By.css('.unit-input__input'))
+      const inputAddress = await findElement(driver, By.css('input[placeholder="Search, public address (0x), or ENS"]'))
       await inputAddress.sendKeys('0x2f318C334780961FB129D2a6c30D0763d9a5C970')
+
+      const recipientRow = await findElement(driver, By.css('.send__select-recipient-wrapper__group-item'))
+      await recipientRow.click()
+      await delay(regularDelayMs)
+
+      const inputAmount = await findElement(driver, By.css('.unit-input__input'))
       await inputAmount.sendKeys('1')
 
       // Set the gas limit