Remove unused confirm transaction files

ui/app/components/pages/confirm-send-token/index.scss

@@ -1,19 +0,0 @@
-.confirm-send-token {
-  &__title {
-    padding: 4px 0;
-    display: flex;
-    align-items: center;
-  }
-
-  &__identicon {
-    flex: 0 0 auto;
-  }
-
-  &__title-text {
-    font-size: 2.25rem;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    padding-left: 8px;
-  }
-}

ui/app/components/pages/index.scss

@@ -3,5 +3,3 @@
 @import './add-token/index';
 
 @import './confirm-add-token/index';
-
-@import './confirm-send-token/index';

ui/app/components/pending-tx/index.js

@@ -1,165 +0,0 @@
-const Component = require('react').Component
-const connect = require('react-redux').connect
-const h = require('react-hyperscript')
-const PropTypes = require('prop-types')
-const clone = require('clone')
-const abi = require('human-standard-token-abi')
-const abiDecoder = require('abi-decoder')
-abiDecoder.addABI(abi)
-const inherits = require('util').inherits
-const actions = require('../../actions')
-const { getSymbolAndDecimals } = require('../../token-util')
-const ConfirmSendEther = require('./confirm-send-ether')
-const ConfirmSendToken = require('./confirm-send-token')
-const ConfirmDeployContract = require('./confirm-deploy-contract')
-const Loading = require('../loading-screen')
-
-const TX_TYPES = {
-  DEPLOY_CONTRACT: 'deploy_contract',
-  SEND_ETHER: 'send_ether',
-  SEND_TOKEN: 'send_token',
-}
-
-module.exports = connect(mapStateToProps, mapDispatchToProps)(PendingTx)
-
-function mapStateToProps (state) {
-  const {
-    conversionRate,
-    identities,
-    tokens: existingTokens,
-  } = state.metamask
-  const accounts = state.metamask.accounts
-  const selectedAddress = state.metamask.selectedAddress || Object.keys(accounts)[0]
-  return {
-    conversionRate,
-    identities,
-    selectedAddress,
-    existingTokens,
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return {
-    backToAccountDetail: address => dispatch(actions.backToAccountDetail(address)),
-    cancelTransaction: ({ id }) => dispatch(actions.cancelTx({ id })),
-  }
-}
-
-inherits(PendingTx, Component)
-function PendingTx () {
-  Component.call(this)
-  this.state = {
-    isFetching: true,
-    transactionType: '',
-    tokenAddress: '',
-    tokenSymbol: '',
-    tokenDecimals: '',
-  }
-}
-
-PendingTx.prototype.componentDidMount = function () {
-  this.setTokenData()
-}
-
-PendingTx.prototype.componentDidUpdate = function (prevProps, prevState) {
-  if (prevState.isFetching) {
-    this.setTokenData()
-  }
-}
-
-PendingTx.prototype.setTokenData = async function () {
-  const { existingTokens } = this.props
-  const txMeta = this.gatherTxMeta()
-  const txParams = txMeta.txParams || {}
-
-  if (txMeta.loadingDefaults) {
-    return
-  }
-
-  if (!txParams.to) {
-    return this.setState({
-      transactionType: TX_TYPES.DEPLOY_CONTRACT,
-      isFetching: false,
-    })
-  }
-
-  // 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 { symbol, decimals } = await getSymbolAndDecimals(txParams.to, existingTokens)
-
-    this.setState({
-      transactionType: TX_TYPES.SEND_TOKEN,
-      tokenAddress: txParams.to,
-      tokenSymbol: symbol,
-      tokenDecimals: decimals,
-      isFetching: false,
-    })
-  } else {
-    this.setState({
-      transactionType: TX_TYPES.SEND_ETHER,
-      isFetching: false,
-    })
-  }
-}
-
-PendingTx.prototype.gatherTxMeta = function () {
-  const props = this.props
-  const state = this.state
-  const txData = clone(state.txData) || clone(props.txData)
-
-  return txData
-}
-
-PendingTx.prototype.render = function () {
-  const {
-    isFetching,
-    transactionType,
-    tokenAddress,
-    tokenSymbol,
-    tokenDecimals,
-  } = this.state
-
-  const { sendTransaction } = this.props
-
-  if (isFetching) {
-    return h(Loading, {
-      loadingMessage: this.context.t('generatingTransaction'),
-    })
-  }
-
-  switch (transactionType) {
-    case TX_TYPES.SEND_ETHER:
-      return h(ConfirmSendEther, {
-        txData: this.gatherTxMeta(),
-        sendTransaction,
-      })
-    case TX_TYPES.SEND_TOKEN:
-      return h(ConfirmSendToken, {
-        txData: this.gatherTxMeta(),
-        sendTransaction,
-        token: {
-          address: tokenAddress,
-          symbol: tokenSymbol,
-          decimals: tokenDecimals,
-        },
-      })
-    case TX_TYPES.DEPLOY_CONTRACT:
-      return h(ConfirmDeployContract, {
-        txData: this.gatherTxMeta(),
-        sendTransaction,
-      })
-    default:
-      return h(Loading)
-  }
-}
-
-PendingTx.contextTypes = {
-  t: PropTypes.func,
-}

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 || {}
+  const { msgParams } = txData
+  log.debug('msgParams detected, rendering pending msg')
 
-  // var isNotification = isPopupOrNotification() === 'notification'
+  return msgParams
-  /*
+    ? h(SignatureRequest, {
-    Client is using the flag above to render the following in conf screen
+      // Properties
-    // subtitle and nav
+      txData: txData,
-    h('.section-title.flex-row.flex-center', [
+      key: txData.id,
-      !isNotification ? h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', {
+      selectedAddress: props.selectedAddress,
-        onClick: this.goHome.bind(this),
+      accounts: props.accounts,
-      }) : null,
+      identities: props.identities,
-      h('h2.page-subtitle', 'Confirm Transaction'),
+      conversionRate,
-      isNotification ? h(NetworkIndicator, {
+      currentCurrency,
-        network: network,
+      blockGasLimit,
-        provider: provider,
+      // Actions
-      }) : null,
+      signMessage: this.signMessage.bind(this, txData),
-    ]),
+      signPersonalMessage: this.signPersonalMessage.bind(this, txData),
-  */
+      signTypedMessage: this.signTypedMessage.bind(this, txData),
-
+      cancelMessage: this.cancelMessage.bind(this, txData),
-  return currentTxView({
+      cancelPersonalMessage: this.cancelPersonalMessage.bind(this, txData),
-    // Properties
+      cancelTypedMessage: this.cancelTypedMessage.bind(this, txData),
-    txData: txData,
+    })
-    key: txData.id,
+    : h(Loading)
-    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))
 }
 
 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)
-//   }
-// }