aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers/app.js
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-07-12 03:18:44 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-07-12 03:18:44 +0800
commita670e54973ed1bae20455507a4b3c44e231ba822 (patch)
tree00300ea3362b7b48be26d6547f89ed4c5bfac597 /ui/app/reducers/app.js
parentc121ac21ec3bed0381e36de7ead1b583a3da148c (diff)
parentf5de16c91174fbbf208e5aef8f542d3bbbb3cb93 (diff)
downloadtangerine-wallet-browser-a670e54973ed1bae20455507a4b3c44e231ba822.tar
tangerine-wallet-browser-a670e54973ed1bae20455507a4b3c44e231ba822.tar.gz
tangerine-wallet-browser-a670e54973ed1bae20455507a4b3c44e231ba822.tar.bz2
tangerine-wallet-browser-a670e54973ed1bae20455507a4b3c44e231ba822.tar.lz
tangerine-wallet-browser-a670e54973ed1bae20455507a4b3c44e231ba822.tar.xz
tangerine-wallet-browser-a670e54973ed1bae20455507a4b3c44e231ba822.tar.zst
tangerine-wallet-browser-a670e54973ed1bae20455507a4b3c44e231ba822.zip
Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin into nonce-tracker
Diffstat (limited to 'ui/app/reducers/app.js')
-rw-r--r--ui/app/reducers/app.js10
1 files changed, 10 insertions, 0 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index deacad0a7..2fcc9bfe0 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -103,7 +103,17 @@ function reduceApp (state, action) {
transForward: action.value,
})
+ case actions.SHOW_ADD_TOKEN_PAGE:
+ return extend(appState, {
+ currentView: {
+ name: 'add-token',
+ context: appState.currentView.context,
+ },
+ transForward: action.value,
+ })
+
case actions.SHOW_IMPORT_PAGE:
+
return extend(appState, {
currentView: {
name: 'import-menu',