diff options
Diffstat (limited to 'ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.component.js')
-rw-r--r-- | ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.component.js | 23 |
1 files changed, 6 insertions, 17 deletions
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 25f2402f1..fc0606365 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 @@ -12,18 +12,17 @@ import { CONFIRM_TOKEN_METHOD_PATH, SIGNATURE_REQUEST_PATH, } from '../../helpers/constants/routes' -import { isConfirmDeployContract } from '../../helpers/utils/transactions.util' import { TOKEN_METHOD_TRANSFER, TOKEN_METHOD_APPROVE, TOKEN_METHOD_TRANSFER_FROM, + DEPLOY_CONTRACT_ACTION_KEY, + SEND_ETHER_ACTION_KEY, } from '../../helpers/constants/transactions' export default class ConfirmTransactionSwitch extends Component { static propTypes = { txData: PropTypes.object, - methodData: PropTypes.object, - fetchingData: PropTypes.bool, isEtherTransaction: PropTypes.bool, isTokenMethod: PropTypes.bool, } @@ -31,31 +30,21 @@ export default class ConfirmTransactionSwitch extends Component { redirectToTransaction () { const { txData, - methodData: { name }, - fetchingData, - isEtherTransaction, - isTokenMethod, } = this.props - const { id, txParams: { data } = {} } = txData + const { id, txParams: { data } = {}, transactionCategory } = txData - if (fetchingData) { - return <Loading /> - } - - if (isConfirmDeployContract(txData)) { + if (transactionCategory === DEPLOY_CONTRACT_ACTION_KEY) { const pathname = `${CONFIRM_TRANSACTION_ROUTE}/${id}${CONFIRM_DEPLOY_CONTRACT_PATH}` return <Redirect to={{ pathname }} /> } - if (isEtherTransaction && !isTokenMethod) { + if (transactionCategory === SEND_ETHER_ACTION_KEY) { const pathname = `${CONFIRM_TRANSACTION_ROUTE}/${id}${CONFIRM_SEND_ETHER_PATH}` return <Redirect to={{ pathname }} /> } if (data) { - const methodName = name && name.toLowerCase() - - switch (methodName) { + switch (transactionCategory) { case TOKEN_METHOD_TRANSFER: { const pathname = `${CONFIRM_TRANSACTION_ROUTE}/${id}${CONFIRM_SEND_TOKEN_PATH}` return <Redirect to={{ pathname }} /> |