diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-09-14 06:39:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-14 06:39:44 +0800 |
| commit | 9e2d4d2bc935243411eb557aab40cbd1081b833f (patch) | |
| tree | cef827b85980374387519a7a69c9439bb716db3f /ui/app/reducers/app.js | |
| parent | 4b880b87bce94c1268401e53b6d7971249311d62 (diff) | |
| parent | d05dfc4eedaeb9000693748ab668479b392f3228 (diff) | |
| download | tangerine-wallet-browser-9e2d4d2bc935243411eb557aab40cbd1081b833f.tar tangerine-wallet-browser-9e2d4d2bc935243411eb557aab40cbd1081b833f.tar.gz tangerine-wallet-browser-9e2d4d2bc935243411eb557aab40cbd1081b833f.tar.bz2 tangerine-wallet-browser-9e2d4d2bc935243411eb557aab40cbd1081b833f.tar.lz tangerine-wallet-browser-9e2d4d2bc935243411eb557aab40cbd1081b833f.tar.xz tangerine-wallet-browser-9e2d4d2bc935243411eb557aab40cbd1081b833f.tar.zst tangerine-wallet-browser-9e2d4d2bc935243411eb557aab40cbd1081b833f.zip | |
Merge branch 'master' into library
Diffstat (limited to 'ui/app/reducers/app.js')
| -rw-r--r-- | ui/app/reducers/app.js | 3 |
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, }, }) |