diff options
author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2019-06-27 01:26:08 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-27 01:26:08 +0800 |
commit | 99209095d17a4ef7da4fc73e7a65849a02baaf69 (patch) | |
tree | f8505fcf8cf3e54919d97bc9c8195a035f09c0c1 /ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.component.js | |
parent | 5a7add38b45ee5099bf9c601cf76119c151168fa (diff) | |
parent | 84c28896a677c7a9b6ea006e0ff45caff006fba3 (diff) | |
download | tangerine-wallet-browser-99209095d17a4ef7da4fc73e7a65849a02baaf69.tar.gz tangerine-wallet-browser-99209095d17a4ef7da4fc73e7a65849a02baaf69.tar.zst tangerine-wallet-browser-99209095d17a4ef7da4fc73e7a65849a02baaf69.zip |
Merge pull request #6749 from MetaMask/v6.7.0
V6.7.0
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 }} /> |