aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers/app.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-08-23 06:03:36 +0800
committerDan Finlay <dan@danfinlay.com>2016-08-23 06:03:36 +0800
commit6e1000f361afcf259beb587d777f3025fcde7667 (patch)
tree758ddcf89896b8c7976347e9e2c97226378e05a6 /ui/app/reducers/app.js
parent270dbacbc472dae660fe8b143df9c64b7f8279cf (diff)
parent3756384da6cb7d1566271cb99ec561d3b051a4ac (diff)
downloadtangerine-wallet-browser-6e1000f361afcf259beb587d777f3025fcde7667.tar
tangerine-wallet-browser-6e1000f361afcf259beb587d777f3025fcde7667.tar.gz
tangerine-wallet-browser-6e1000f361afcf259beb587d777f3025fcde7667.tar.bz2
tangerine-wallet-browser-6e1000f361afcf259beb587d777f3025fcde7667.tar.lz
tangerine-wallet-browser-6e1000f361afcf259beb587d777f3025fcde7667.tar.xz
tangerine-wallet-browser-6e1000f361afcf259beb587d777f3025fcde7667.tar.zst
tangerine-wallet-browser-6e1000f361afcf259beb587d777f3025fcde7667.zip
Merge branch 'master' into PopupNotifications
Diffstat (limited to 'ui/app/reducers/app.js')
-rw-r--r--ui/app/reducers/app.js14
1 files changed, 14 insertions, 0 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index deebf02be..94b7e8bf7 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -485,6 +485,20 @@ function reduceApp (state, action) {
data: action.value.data,
},
})
+
+ case actions.SHOW_QR_VIEW:
+ return extend(appState, {
+ currentView: {
+ name: 'qr',
+ context: appState.currentView.context,
+ },
+ transForward: true,
+ Qr: {
+ message: action.value.message,
+ image: action.value.qr,
+ data: action.value.data,
+ },
+ })
default:
return appState
}