From 009bf802f76fcbfc5a01aeda6273157884a1b59d Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Mon, 16 Sep 2019 17:05:21 -0230
Subject: [PATCH] Fix recipient field of approve screen (#7171)

---
 test/e2e/contract-test/contract.js |  4 ++--
 test/e2e/metamask-ui.spec.js       | 14 +++++++++++++-
 ui/app/helpers/utils/token-util.js |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/test/e2e/contract-test/contract.js b/test/e2e/contract-test/contract.js
index 38db041c8..971523de2 100644
--- a/test/e2e/contract-test/contract.js
+++ b/test/e2e/contract-test/contract.js
@@ -129,10 +129,10 @@ web3.currentProvider.enable().then(() => {
           })
 
           approveTokens.addEventListener('click', function () {
-            contract.approve('0x2f318C334780961FB129D2a6c30D0763d9a5C970', '70000', {
+            contract.approve('0x9bc5baF874d2DA8D216aE9f137804184EE5AfEF4', '70000', {
               from: web3.eth.accounts[0],
               to: contract.address,
-              data: '0x095ea7b30000000000000000000000002f318C334780961FB129D2a6c30D0763d9a5C9700000000000000000000000000000000000000000000000000000000000000005',
+              data: '0x095ea7b30000000000000000000000009bc5baF874d2DA8D216aE9f137804184EE5AfEF40000000000000000000000000000000000000000000000000000000000000005',
               gas: 60000,
               gasPrice: '20000000000',
             }, function (result) {
diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js
index 90f320904..fadabe7c8 100644
--- a/test/e2e/metamask-ui.spec.js
+++ b/test/e2e/metamask-ui.spec.js
@@ -1276,7 +1276,7 @@ describe('MetaMask', function () {
 
       const confirmDataDiv = await findElement(driver, By.css('.confirm-page-container-content__data-box'))
       const confirmDataText = await confirmDataDiv.getText()
-      assert(confirmDataText.match(/0x095ea7b30000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c97/))
+      assert(confirmDataText.match(/0x095ea7b30000000000000000000000009bc5baf874d2da8d216ae9f137804184ee5afef4/))
 
       const detailsTab = await findElement(driver, By.xpath(`//li[contains(text(), 'Details')]`))
       detailsTab.click()
@@ -1336,6 +1336,12 @@ describe('MetaMask', function () {
       assert.equal(await gasFeeInputs[0].getText(), '0.0006')
     })
 
+    it('shows the correct recipient', async function () {
+      const senderToRecipientDivs = await findElements(driver, By.css('.sender-to-recipient__name'))
+      const recipientDiv = senderToRecipientDivs[1]
+      assert.equal(await recipientDiv.getText(), '0x9bc5...fEF4')
+    })
+
     it('submits the transaction', async function () {
       const confirmButton = await findElement(driver, By.xpath(`//button[contains(text(), 'Confirm')]`))
       await confirmButton.click()
@@ -1450,6 +1456,12 @@ describe('MetaMask', function () {
       await delay(regularDelayMs)
     })
 
+    it('shows the correct recipient', async function () {
+      const senderToRecipientDivs = await findElements(driver, By.css('.sender-to-recipient__name'))
+      const recipientDiv = senderToRecipientDivs[1]
+      assert.equal(await recipientDiv.getText(), 'Account 2')
+    })
+
     it('submits the transaction', async function () {
       await delay(regularDelayMs)
       const confirmButton = await findElement(driver, By.xpath(`//button[contains(text(), 'Confirm')]`))
diff --git a/ui/app/helpers/utils/token-util.js b/ui/app/helpers/utils/token-util.js
index 3920045ac..831d85131 100644
--- a/ui/app/helpers/utils/token-util.js
+++ b/ui/app/helpers/utils/token-util.js
@@ -135,5 +135,5 @@ export function getTokenValue (tokenParams = []) {
 
 export function getTokenToAddress (tokenParams = []) {
   const toAddressData = tokenParams.find(param => param.name === '_to')
-  return toAddressData && toAddressData.value
+  return toAddressData ? toAddressData.value : tokenParams[0].value
 }