aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-09-14 03:52:43 +0800
committerGitHub <noreply@github.com>2016-09-14 03:52:43 +0800
commit3b2182f576948e4ab57d23c2161227178f5dc20c (patch)
tree425f11071576a44ca4327125056ac217ae499bae /ui/app/reducers
parent54ecb09a209bf3ffeba968a79acfa500625b0d4a (diff)
parent19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a (diff)
downloadtangerine-wallet-browser-3b2182f576948e4ab57d23c2161227178f5dc20c.tar
tangerine-wallet-browser-3b2182f576948e4ab57d23c2161227178f5dc20c.tar.gz
tangerine-wallet-browser-3b2182f576948e4ab57d23c2161227178f5dc20c.tar.bz2
tangerine-wallet-browser-3b2182f576948e4ab57d23c2161227178f5dc20c.tar.lz
tangerine-wallet-browser-3b2182f576948e4ab57d23c2161227178f5dc20c.tar.xz
tangerine-wallet-browser-3b2182f576948e4ab57d23c2161227178f5dc20c.tar.zst
tangerine-wallet-browser-3b2182f576948e4ab57d23c2161227178f5dc20c.zip
Merge pull request #648 from MetaMask/qrCode
Put qr button back in account detail screen...
Diffstat (limited to 'ui/app/reducers')
-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,
},
})