aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-06-01 02:09:24 +0800
committerDan <danjm.com@gmail.com>2018-06-01 02:09:24 +0800
commit701611e317d120d2c0530e4794bd498a74e233b2 (patch)
tree4ec098d593de7ff5fe20907a48c56061cc14de54 /ui/app/app.js
parent1bde2892ec222cec1ba3265d50ed59f665afbf83 (diff)
parent2ca084b0557242b34733107701a14ba0724363b3 (diff)
downloadtangerine-wallet-browser-701611e317d120d2c0530e4794bd498a74e233b2.tar
tangerine-wallet-browser-701611e317d120d2c0530e4794bd498a74e233b2.tar.gz
tangerine-wallet-browser-701611e317d120d2c0530e4794bd498a74e233b2.tar.bz2
tangerine-wallet-browser-701611e317d120d2c0530e4794bd498a74e233b2.tar.lz
tangerine-wallet-browser-701611e317d120d2c0530e4794bd498a74e233b2.tar.xz
tangerine-wallet-browser-701611e317d120d2c0530e4794bd498a74e233b2.tar.zst
tangerine-wallet-browser-701611e317d120d2c0530e4794bd498a74e233b2.zip
Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-estimation
Diffstat (limited to 'ui/app/app.js')
-rw-r--r--ui/app/app.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index c4fddf1eb..09f7fdef4 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -76,7 +76,7 @@ class App extends Component {
h(Authenticated, { path: REVEAL_SEED_ROUTE, exact, component: RevealSeedConfirmation }),
h(Authenticated, { path: SETTINGS_ROUTE, component: Settings }),
h(Authenticated, { path: NOTICE_ROUTE, exact, component: NoticeScreen }),
- h(Authenticated, { path: CONFIRM_TRANSACTION_ROUTE, component: ConfirmTxScreen }),
+ h(Authenticated, { path: `${CONFIRM_TRANSACTION_ROUTE}/:id?`, component: ConfirmTxScreen }),
h(Authenticated, { path: SEND_ROUTE, exact, component: SendTransactionScreen }),
h(Authenticated, { path: ADD_TOKEN_ROUTE, exact, component: AddTokenPage }),
h(Authenticated, { path: CONFIRM_ADD_TOKEN_ROUTE, exact, component: ConfirmAddTokenPage }),
@@ -137,7 +137,6 @@ class App extends Component {
(isLoading || isLoadingNetwork) && h(Loading, {
loadingMessage: loadMessage,
- fullScreen: true,
}),
// content