aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pages/confirm-transaction
diff options
context:
space:
mode:
authorAlexander Tseung <alextsg@gmail.com>2018-07-15 04:47:07 +0800
committerAlexander Tseung <alextsg@gmail.com>2018-07-18 04:38:14 +0800
commitd19c42fcaeea933793ed459ab5248b42811a0498 (patch)
tree345394ef9704fa0afd0d713e4d9ef052bcc943fc /ui/app/components/pages/confirm-transaction
parente9a8c24cc4d26e33380a33e87e80952918339ad7 (diff)
downloadtangerine-wallet-browser-d19c42fcaeea933793ed459ab5248b42811a0498.tar
tangerine-wallet-browser-d19c42fcaeea933793ed459ab5248b42811a0498.tar.gz
tangerine-wallet-browser-d19c42fcaeea933793ed459ab5248b42811a0498.tar.bz2
tangerine-wallet-browser-d19c42fcaeea933793ed459ab5248b42811a0498.tar.lz
tangerine-wallet-browser-d19c42fcaeea933793ed459ab5248b42811a0498.tar.xz
tangerine-wallet-browser-d19c42fcaeea933793ed459ab5248b42811a0498.tar.zst
tangerine-wallet-browser-d19c42fcaeea933793ed459ab5248b42811a0498.zip
Add fallback when no function found, fix network colors, add fiat values for tokens with contract exchange rates
Diffstat (limited to 'ui/app/components/pages/confirm-transaction')
-rw-r--r--ui/app/components/pages/confirm-transaction/confirm-transaction.component.js7
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}
/>