1 files changed, 23 insertions, 113 deletions

diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 4e8aaa07d..112ea6bca 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -9,11 +9,7 @@ const txHelper = require('../lib/tx-helper')
 const log = require('loglevel')
 const R = require('ramda')
 
-const PendingTx = require('./components/pending-tx')
 const SignatureRequest = require('./components/signature-request')
-// const PendingMsg = require('./components/pending-msg')
-// const PendingPersonalMsg = require('./components/pending-personal-msg')
-// const PendingTypedMsg = require('./components/pending-typed-msg')
 const Loading = require('./components/loading-screen')
 const { DEFAULT_ROUTE } = require('./routes')
 
@@ -151,101 +147,32 @@ ConfirmTxScreen.prototype.render = function () {
     currentCurrency,
     conversionRate,
     blockGasLimit,
-    // provider,
-    // computedBalances,
   } = props
 
   var txData = this.getTxData() || {}
-  var txParams = txData.params || {}
-
-  // var isNotification = isPopupOrNotification() === 'notification'
-  /*
-    Client is using the flag above to render the following in conf screen
-    // subtitle and nav
-    h('.section-title.flex-row.flex-center', [
-      !isNotification ? h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', {
-        onClick: this.goHome.bind(this),
-      }) : null,
-      h('h2.page-subtitle', 'Confirm Transaction'),
-      isNotification ? h(NetworkIndicator, {
-        network: network,
-        provider: provider,
-      }) : null,
-    ]),
-  */
-
-  return currentTxView({
-    // Properties
-    txData: txData,
-    key: txData.id,
-    selectedAddress: props.selectedAddress,
-    accounts: props.accounts,
-    identities: props.identities,
-    conversionRate,
-    currentCurrency,
-    blockGasLimit,
-    // Actions
-    buyEth: this.buyEth.bind(this, txParams.from || props.selectedAddress),
-    sendTransaction: this.sendTransaction.bind(this),
-    cancelTransaction: this.cancelTransaction.bind(this, txData),
-    signMessage: this.signMessage.bind(this, txData),
-    signPersonalMessage: this.signPersonalMessage.bind(this, txData),
-    signTypedMessage: this.signTypedMessage.bind(this, txData),
-    cancelMessage: this.cancelMessage.bind(this, txData),
-    cancelPersonalMessage: this.cancelPersonalMessage.bind(this, txData),
-    cancelTypedMessage: this.cancelTypedMessage.bind(this, txData),
-  })
-}
-
-function currentTxView (opts) {
-  log.info('rendering current tx view')
-  const { txData } = opts
-  const { txParams, msgParams } = txData
-
-  if (txParams) {
-    log.debug('txParams detected, rendering pending tx')
-    return h(PendingTx, opts)
-  } else if (msgParams) {
-    log.debug('msgParams detected, rendering pending msg')
-
-    return h(SignatureRequest, opts)
-
-    // if (type === 'eth_sign') {
-    //   log.debug('rendering eth_sign message')
-    //   return h(PendingMsg, opts)
-    // } else if (type === 'personal_sign') {
-    //   log.debug('rendering personal_sign message')
-    // return h(PendingPersonalMsg, opts)
-    // } else if (type === 'eth_signTypedData') {
-    //   log.debug('rendering eth_signTypedData message')
-    //   return h(PendingTypedMsg, opts)
-    // }
-  }
-
-  return h(Loading)
-}
-
-ConfirmTxScreen.prototype.buyEth = function (address, event) {
-  event.preventDefault()
-  this.props.dispatch(actions.buyEthView(address))
-}
-
-ConfirmTxScreen.prototype.sendTransaction = function (txData, event) {
-  this.stopPropagation(event)
-  this.props.dispatch(actions.updateAndApproveTx(txData))
-    .then(() => this.props.history.push(DEFAULT_ROUTE))
-}
-
-ConfirmTxScreen.prototype.cancelTransaction = function (txData, event) {
-  this.stopPropagation(event)
-  event.preventDefault()
-  this.props.dispatch(actions.cancelTx(txData))
-}
-
-ConfirmTxScreen.prototype.cancelAllTransactions = function (unconfTxList, event) {
-  this.stopPropagation(event)
-  event.preventDefault()
-  this.props.dispatch(actions.cancelAllTx(unconfTxList))
+  const { msgParams } = txData
+  log.debug('msgParams detected, rendering pending msg')
+
+  return msgParams
+    ? h(SignatureRequest, {
+      // Properties
+      txData: txData,
+      key: txData.id,
+      selectedAddress: props.selectedAddress,
+      accounts: props.accounts,
+      identities: props.identities,
+      conversionRate,
+      currentCurrency,
+      blockGasLimit,
+      // Actions
+      signMessage: this.signMessage.bind(this, txData),
+      signPersonalMessage: this.signPersonalMessage.bind(this, txData),
+      signTypedMessage: this.signTypedMessage.bind(this, txData),
+      cancelMessage: this.cancelMessage.bind(this, txData),
+      cancelPersonalMessage: this.cancelPersonalMessage.bind(this, txData),
+      cancelTypedMessage: this.cancelTypedMessage.bind(this, txData),
+    })
+    : h(Loading)
 }
 
 ConfirmTxScreen.prototype.signMessage = function (msgData, event) {
@@ -295,20 +222,3 @@ ConfirmTxScreen.prototype.cancelTypedMessage = function (msgData, event) {
   this.stopPropagation(event)
   return this.props.dispatch(actions.cancelTypedMsg(msgData))
 }
-
-ConfirmTxScreen.prototype.goHome = function (event) {
-  this.stopPropagation(event)
-  this.props.dispatch(actions.goHome())
-}
-
-// function warningIfExists (warning) {
-//   if (warning &&
-//      // Do not display user rejections on this screen:
-//      warning.indexOf('User denied transaction signature') === -1) {
-//     return h('.error', {
-//       style: {
-//         margin: 'auto',
-//       },
-//     }, warning)
-//   }
-// }