diff options
author | Akihiro <an0326ja@gmail.com> | 2018-07-21 09:47:14 +0800 |
---|---|---|
committer | Akihiro <an0326ja@gmail.com> | 2018-07-21 09:47:14 +0800 |
commit | 8c77e998e0491dfb48c91d2938644c9f855a2532 (patch) | |
tree | f3e54e635c92d54111ac2ddfc3e780ccdcdaf968 /ui/app/components/pages/confirm-transaction | |
parent | 9dd637569d5c820d07ff15a8039f5ce5590f41dd (diff) | |
parent | e094d4ad1fb84a9bc663c328d0650bd9d8bf8716 (diff) | |
download | tangerine-wallet-browser-8c77e998e0491dfb48c91d2938644c9f855a2532.tar.gz tangerine-wallet-browser-8c77e998e0491dfb48c91d2938644c9f855a2532.tar.zst tangerine-wallet-browser-8c77e998e0491dfb48c91d2938644c9f855a2532.zip |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'ui/app/components/pages/confirm-transaction')
-rw-r--r-- | ui/app/components/pages/confirm-transaction/confirm-transaction.component.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/app/components/pages/confirm-transaction/confirm-transaction.component.js b/ui/app/components/pages/confirm-transaction/confirm-transaction.component.js index 874a89fd2..3ac656d73 100644 --- a/ui/app/components/pages/confirm-transaction/confirm-transaction.component.js +++ b/ui/app/components/pages/confirm-transaction/confirm-transaction.component.js @@ -8,6 +8,7 @@ import ConfirmSendEther from '../confirm-send-ether' import ConfirmSendToken from '../confirm-send-token' import ConfirmDeployContract from '../confirm-deploy-contract' import ConfirmApprove from '../confirm-approve' +import ConfirmTokenTransactionBase from '../confirm-token-transaction-base' import ConfTx from '../../../conf-tx' import { DEFAULT_ROUTE, @@ -16,6 +17,7 @@ import { CONFIRM_SEND_ETHER_PATH, CONFIRM_SEND_TOKEN_PATH, CONFIRM_APPROVE_PATH, + CONFIRM_TRANSFER_FROM_PATH, CONFIRM_TOKEN_METHOD_PATH, SIGNATURE_REQUEST_PATH, } from '../../../routes' @@ -139,6 +141,11 @@ export default class ConfirmTransaction extends Component { /> <Route exact + path={`${CONFIRM_TRANSACTION_ROUTE}/:id?${CONFIRM_TRANSFER_FROM_PATH}`} + component={ConfirmTokenTransactionBase} + /> + <Route + exact path={`${CONFIRM_TRANSACTION_ROUTE}/:id?${SIGNATURE_REQUEST_PATH}`} component={ConfTx} /> |