aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-06-01 01:58:03 +0800
committerDan <danjm.com@gmail.com>2018-06-01 01:58:03 +0800
commit5091b03e4b2499697cda376a44405139827068cd (patch)
treeda91af2a0ce21871c15611f768f09757ef2c8533 /ui/app/app.js
parent6d8344d0d0af3734255a0e9e79d857d84b5fe2aa (diff)
parentcc73d869fed79c63261821fb7ad8f1e5180ffca2 (diff)
downloadtangerine-wallet-browser-5091b03e4b2499697cda376a44405139827068cd.tar.gz
tangerine-wallet-browser-5091b03e4b2499697cda376a44405139827068cd.tar.zst
tangerine-wallet-browser-5091b03e4b2499697cda376a44405139827068cd.zip
Merge branch 'develop' into i3725-refactor-send-component-
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