Fix recipient field of approve screen

MetaMask · Sep 16, 2019 · a42b03f · a42b03f
1 parent bf72f39
commit a42b03f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/test/e2e/contract-test/contract.js b/test/e2e/contract-test/contract.js
diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js
@@ -1220,7 +1220,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()
@@ -1280,6 +1280,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()
@@ -1394,6 +1400,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
@@ -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
 }