From dc92b56f184100a24aaf53c3e93619514159f938 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Tue, 20 Mar 2018 09:07:23 -0230
Subject: Identify token transactions by method names token data, and not just
 whether they've been add via metamask.

---
 ui/app/components/pending-tx/confirm-send-token.js |  1 +
 ui/app/components/pending-tx/index.js              | 14 ++++++++++----
 ui/app/selectors.js                                |  3 ++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js
index 0a4182014..c347dd21e 100644
--- a/ui/app/components/pending-tx/confirm-send-token.js
+++ b/ui/app/components/pending-tx/confirm-send-token.js
@@ -86,6 +86,7 @@ function mapDispatchToProps (dispatch, ownProps) {
         amount: tokenAmountInHex,
         errors: { to: null, amount: null },
         editingTransactionId: id,
+        token: ownProps.token,
       }))
       dispatch(actions.showSendTokenPage())
     },
diff --git a/ui/app/components/pending-tx/index.js b/ui/app/components/pending-tx/index.js
index f4f6afb8f..9676e9c86 100644
--- a/ui/app/components/pending-tx/index.js
+++ b/ui/app/components/pending-tx/index.js
@@ -63,14 +63,17 @@ PendingTx.prototype.componentWillMount = async function () {
       isFetching: false,
     })
   }
+  const tokenData = txParams && abiDecoder.decodeMethod(txParams.data)
+  const { name: tokenMethodName } = tokenData || {}
+  const isTokenTransaction = ['transfer', 'approve', 'transferFrom']
+    .find(possibleName => tokenMethodName === possibleName)
 
-  try {
+  if (isTokenTransaction) {
     const token = util.getContractAtAddress(txParams.to)
     const results = await Promise.all([
       token.symbol(),
       token.decimals(),
     ])
-
     const [ symbol, decimals ] = results
 
     if (symbol[0] && decimals[0]) {
@@ -83,11 +86,14 @@ PendingTx.prototype.componentWillMount = async function () {
       })
     } else {
       this.setState({
-        transactionType: TX_TYPES.SEND_ETHER,
+        transactionType: TX_TYPES.SEND_TOKEN,
+        tokenAddress: txParams.to,
+        tokenSymbol: null,
+        tokenDecimals: null,
         isFetching: false,
       })
     }
-  } catch (e) {
+  } else {
     this.setState({
       transactionType: TX_TYPES.SEND_ETHER,
       isFetching: false,
diff --git a/ui/app/selectors.js b/ui/app/selectors.js
index 5d2635775..a8b32f129 100644
--- a/ui/app/selectors.js
+++ b/ui/app/selectors.js
@@ -55,8 +55,9 @@ function getSelectedToken (state) {
   const tokens = state.metamask.tokens || []
   const selectedTokenAddress = state.metamask.selectedTokenAddress
   const selectedToken = tokens.filter(({ address }) => address === selectedTokenAddress)[0]
+  const sendToken = state.metamask.send.token
 
-  return selectedToken || null
+  return selectedToken || sendToken || null
 }
 
 function getSelectedTokenExchangeRate (state) {
-- 
cgit v1.2.3


From 3e79941658e58f5ef74cd9545c2b69136362ec76 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Wed, 21 Mar 2018 13:12:59 -0700
Subject: ui - tx conf - only show special token tx conf screen for token send

---
 ui/app/components/pending-tx/index.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ui/app/components/pending-tx/index.js b/ui/app/components/pending-tx/index.js
index 9676e9c86..9c0453a3b 100644
--- a/ui/app/components/pending-tx/index.js
+++ b/ui/app/components/pending-tx/index.js
@@ -63,10 +63,14 @@ PendingTx.prototype.componentWillMount = async function () {
       isFetching: false,
     })
   }
-  const tokenData = txParams && abiDecoder.decodeMethod(txParams.data)
-  const { name: tokenMethodName } = tokenData || {}
-  const isTokenTransaction = ['transfer', 'approve', 'transferFrom']
-    .find(possibleName => tokenMethodName === possibleName)
+
+  // inspect tx data for supported special confirmation screens
+  let isTokenTransaction = false
+  if (txParams.data) {
+    const tokenData = abiDecoder.decodeMethod(txParams.data)
+    const { name: tokenMethodName } = tokenData || {}
+    isTokenTransaction = (tokenMethodName === 'transfer')
+  }
 
   if (isTokenTransaction) {
     const token = util.getContractAtAddress(txParams.to)
-- 
cgit v1.2.3


From 4c2cf15d2ad9cdfee4ce67b795877c7ab60231a7 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Wed, 21 Mar 2018 13:31:43 -0700
Subject: test - flat - add extra timeout, idk maybe

---
 test/integration/lib/send-new-ui.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/integration/lib/send-new-ui.js b/test/integration/lib/send-new-ui.js
index 3fc7c79f8..46e0ef0e4 100644
--- a/test/integration/lib/send-new-ui.js
+++ b/test/integration/lib/send-new-ui.js
@@ -127,6 +127,7 @@ async function runSendFlowTest(assert, done) {
 
   selectState.val('send edit')
   reactTriggerChange(selectState[0])
+  await timeout(10000)
 
   const confirmFromName = (await queryAsync($, '.sender-to-recipient__sender-name')).first()
   assert.equal(confirmFromName[0].textContent, 'Send Account 2', 'confirm screen should show correct from name')
-- 
cgit v1.2.3