From 8458873a2002b518075209276941878829d02162 Mon Sep 17 00:00:00 2001
From: Dan Miller <danjm.com@gmail.com>
Date: Fri, 29 Mar 2019 13:35:23 -0230
Subject: [PATCH] Ensure correct confirm screen in case of smartcontract check
 fail

---
 .../confirm-transaction-switch.component.js                 | 4 +++-
 .../confirm-transaction-switch.container.js                 | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.component.js b/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.component.js
index cd471b822..25f2402f1 100644
--- a/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.component.js
+++ b/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.component.js
@@ -25,6 +25,7 @@ export default class ConfirmTransactionSwitch extends Component {
     methodData: PropTypes.object,
     fetchingData: PropTypes.bool,
     isEtherTransaction: PropTypes.bool,
+    isTokenMethod: PropTypes.bool,
   }
 
   redirectToTransaction () {
@@ -33,6 +34,7 @@ export default class ConfirmTransactionSwitch extends Component {
       methodData: { name },
       fetchingData,
       isEtherTransaction,
+      isTokenMethod,
     } = this.props
     const { id, txParams: { data } = {} } = txData
 
@@ -45,7 +47,7 @@ export default class ConfirmTransactionSwitch extends Component {
       return <Redirect to={{ pathname }} />
     }
 
-    if (isEtherTransaction) {
+    if (isEtherTransaction && !isTokenMethod) {
       const pathname = `${CONFIRM_TRANSACTION_ROUTE}/${id}${CONFIRM_SEND_ETHER_PATH}`
       return <Redirect to={{ pathname }} />
     }
diff --git a/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.container.js b/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.container.js
index 7f2c36af2..c0b01a11e 100644
--- a/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.container.js
+++ b/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.container.js
@@ -1,5 +1,10 @@
 import { connect } from 'react-redux'
 import ConfirmTransactionSwitch from './confirm-transaction-switch.component'
+import {
+  TOKEN_METHOD_TRANSFER,
+  TOKEN_METHOD_APPROVE,
+  TOKEN_METHOD_TRANSFER_FROM,
+} from '../../helpers/constants/transactions'
 
 const mapStateToProps = state => {
   const {
@@ -16,6 +21,7 @@ const mapStateToProps = state => {
     methodData,
     fetchingData,
     isEtherTransaction: !toSmartContract,
+    isTokenMethod: [TOKEN_METHOD_APPROVE, TOKEN_METHOD_TRANSFER, TOKEN_METHOD_TRANSFER_FROM].includes(methodData.name)
   }
 }