aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers/app.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-09-14 04:00:29 +0800
committerDan Finlay <dan@danfinlay.com>2016-09-14 04:00:29 +0800
commitb624155e60c713e5e1de67b51bf34083ecfed0ef (patch)
tree2275151d2dc2ae2a847cfa7c960d6de174dbcaf6 /ui/app/reducers/app.js
parent3da0d61417b4ca64fb8bd93779d4c53891bb7630 (diff)
parent194f1724f36fb6d964513aa7b364b0835af5d93d (diff)
downloadtangerine-wallet-browser-b624155e60c713e5e1de67b51bf34083ecfed0ef.tar
tangerine-wallet-browser-b624155e60c713e5e1de67b51bf34083ecfed0ef.tar.gz
tangerine-wallet-browser-b624155e60c713e5e1de67b51bf34083ecfed0ef.tar.bz2
tangerine-wallet-browser-b624155e60c713e5e1de67b51bf34083ecfed0ef.tar.lz
tangerine-wallet-browser-b624155e60c713e5e1de67b51bf34083ecfed0ef.tar.xz
tangerine-wallet-browser-b624155e60c713e5e1de67b51bf34083ecfed0ef.tar.zst
tangerine-wallet-browser-b624155e60c713e5e1de67b51bf34083ecfed0ef.zip
Merge branch 'i646-ClosePopupBug' of github.com:MetaMask/metamask-plugin into i646-ClosePopupBug
Diffstat (limited to 'ui/app/reducers/app.js')
-rw-r--r--ui/app/reducers/app.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index c39d89a4d..8eb6ec4d4 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -495,9 +495,9 @@ function reduceApp (state, action) {
return extend(appState, {
qrRequested: true,
transForward: true,
+
Qr: {
message: action.value.message,
- image: action.value.qr,
data: action.value.data,
},
})
@@ -511,7 +511,6 @@ function reduceApp (state, action) {
transForward: true,
Qr: {
message: action.value.message,
- image: action.value.qr,
data: action.value.data,
},
})