aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2017-09-29 22:50:09 +0800
committerChi Kei Chan <chikeichan@gmail.com>2017-10-02 09:58:57 +0800
commit7c4d8c45624ef840b8806589b47997e7c7c396f3 (patch)
tree976cea42949d30e528c4b78d74135fd7d54f22a9 /ui/app/app.js
parent67ee5b21e6f64ac22e65f2712ae13dd8c09ed113 (diff)
downloadtangerine-wallet-browser-7c4d8c45624ef840b8806589b47997e7c7c396f3.tar
tangerine-wallet-browser-7c4d8c45624ef840b8806589b47997e7c7c396f3.tar.gz
tangerine-wallet-browser-7c4d8c45624ef840b8806589b47997e7c7c396f3.tar.bz2
tangerine-wallet-browser-7c4d8c45624ef840b8806589b47997e7c7c396f3.tar.lz
tangerine-wallet-browser-7c4d8c45624ef840b8806589b47997e7c7c396f3.tar.xz
tangerine-wallet-browser-7c4d8c45624ef840b8806589b47997e7c7c396f3.tar.zst
tangerine-wallet-browser-7c4d8c45624ef840b8806589b47997e7c7c396f3.zip
Enables the old shapeshift UI within new ui.
Diffstat (limited to 'ui/app/app.js')
-rw-r--r--ui/app/app.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 7468551eb..cf9850f9f 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -72,6 +72,7 @@ function mapStateToProps (state) {
lastUnreadNotice: state.metamask.lastUnreadNotice,
lostAccounts: state.metamask.lostAccounts,
frequentRpcList: state.metamask.frequentRpcList || [],
+ Qr: state.appState.Qr,
// state needed to get account dropdown temporarily rendering from app bar
identities,
@@ -395,7 +396,10 @@ App.prototype.renderPrimary = function () {
width: '285px',
},
}, [
- h(QrView, {key: 'qr'}),
+ h(QrView, {
+ key: 'qr',
+ Qr: props.Qr,
+ }),
]),
])