diff options
author | Esteban MiƱo <efmino@uc.cl> | 2018-08-08 05:50:58 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-08 05:50:58 +0800 |
commit | 3f57d5f66b3bcb744f918238bf1831dbf9abec9c (patch) | |
tree | 2d1f6149928a6efaa38cc3c55afec6b5e1a7709e /old-ui/app/components/shapeshift-form.js | |
parent | 00d1f6fec5457f05fb2e6aec1300dd2dbef51ec1 (diff) | |
parent | e9f74f005de581377bc0a605e4696840dfb95ba9 (diff) | |
download | tangerine-wallet-browser-3f57d5f66b3bcb744f918238bf1831dbf9abec9c.tar.gz tangerine-wallet-browser-3f57d5f66b3bcb744f918238bf1831dbf9abec9c.tar.zst tangerine-wallet-browser-3f57d5f66b3bcb744f918238bf1831dbf9abec9c.zip |
Merge branch 'develop' into WatchTokenFeature
Diffstat (limited to 'old-ui/app/components/shapeshift-form.js')
-rw-r--r-- | old-ui/app/components/shapeshift-form.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/old-ui/app/components/shapeshift-form.js b/old-ui/app/components/shapeshift-form.js index 97068db0a..14de309ab 100644 --- a/old-ui/app/components/shapeshift-form.js +++ b/old-ui/app/components/shapeshift-form.js @@ -3,7 +3,6 @@ const h = require('react-hyperscript') const inherits = require('util').inherits const connect = require('react-redux').connect const actions = require('../../../ui/app/actions') -const Qr = require('./qr-code') const isValidAddress = require('../util').isValidAddress module.exports = connect(mapStateToProps)(ShapeshiftForm) @@ -11,7 +10,6 @@ function mapStateToProps (state) { return { warning: state.appState.warning, isSubLoading: state.appState.isSubLoading, - qrRequested: state.appState.qrRequested, } } @@ -23,7 +21,7 @@ function ShapeshiftForm () { } ShapeshiftForm.prototype.render = function () { - return this.props.qrRequested ? h(Qr, {key: 'qr'}) : this.renderMain() + return this.renderMain() } ShapeshiftForm.prototype.renderMain = function () { |