diff options
author | Dan Finlay <somniac@me.com> | 2016-08-19 22:57:51 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-19 22:57:51 +0800 |
commit | 30af7e96cba7a88d46d3376097e4d44b715f834c (patch) | |
tree | c2bb2a52f309be3b781ac0ba6ef8df0b287d991c /ui/app/reducers | |
parent | 9c29328085fbad82ce7bce4659ce6968405a7b3c (diff) | |
parent | 9cd85aea2f858cb79f82cde57e53096756092503 (diff) | |
download | tangerine-wallet-browser-30af7e96cba7a88d46d3376097e4d44b715f834c.tar.gz tangerine-wallet-browser-30af7e96cba7a88d46d3376097e4d44b715f834c.tar.zst tangerine-wallet-browser-30af7e96cba7a88d46d3376097e4d44b715f834c.zip |
Merge pull request #559 from MetaMask/shapeshiftTx
Shapeshift tx
Diffstat (limited to 'ui/app/reducers')
-rw-r--r-- | ui/app/reducers/app.js | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 95b60f929..8c2696877 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -476,6 +476,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 } |